Changeset 46385


Ignore:
Timestamp:
2015-07-15T16:41:45+02:00 (3 years ago)
Author:
jogo
Message:

xtables-addons: update to 2.7 to fix compilation with 4.1

Also drop the configure (not .ac) patch part as autoreconf will
overwrite it anyway with a newly generated version.

Signed-off-by: Jonas Gorski <jogo@…>
Acked-by: Jo-Philipp Wich <jow@…>

Location:
trunk/package/network/utils/xtables-addons
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/utils/xtables-addons/Makefile

    r46111 r46385  
    1010 
    1111PKG_NAME:=xtables-addons 
    12 PKG_VERSION:=2.5 
     12PKG_VERSION:=2.7 
    1313PKG_RELEASE:=1 
    14 PKG_MD5SUM:=335663ece5fb17c7d0bb24dbdc697eb1 
     14PKG_MD5SUM:=81bd7ba82e5f7bfd1458fc97ddf72e1d 
    1515 
    1616PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 
     
    9393    SUBMENU:=Netfilter Extensions 
    9494    TITLE:=$(2) netfilter module 
    95     DEPENDS:=+kmod-ipt-core @!LINUX_4_1 $(5) 
     95    DEPENDS:=+kmod-ipt-core $(5) 
    9696    KCONFIG:=$(6) 
    9797    FILES:=$(foreach mod,$(4),$(PKG_BUILD_DIR)/extensions/$(mod).$(LINUX_KMOD_SUFFIX)) 
  • trunk/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch

    r42256 r46385  
    1 --- a/configure 
    2 +++ b/configure 
    3 @@ -1,9 +1,11 @@ 
    4  #! /bin/sh 
    5  # Guess values for system-dependent variables and create Makefiles. 
    6 -# Generated by GNU Autoconf 2.69 for xtables-addons 2.5. 
    7 +# Generated by GNU Autoconf 2.68 for xtables-addons 2.5. 
    8  # 
    9  # 
    10 -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. 
    11 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 
    12 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 
    13 +# Foundation, Inc. 
    14  # 
    15  # 
    16  # This configure script is free software; the Free Software Foundation 
    17 @@ -132,31 +134,6 @@ export LANGUAGE 
    18  # CDPATH. 
    19  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH 
    20   
    21 -# Use a proper internal environment variable to ensure we don't fall 
    22 -  # into an infinite loop, continuously re-executing ourselves. 
    23 -  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then 
    24 -    _as_can_reexec=no; export _as_can_reexec; 
    25 -    # We cannot yet assume a decent shell, so we have to provide a 
    26 -# neutralization value for shells without unset; and this also 
    27 -# works around shells that cannot unset nonexistent variables. 
    28 -# Preserve -v and -x to the replacement shell. 
    29 -BASH_ENV=/dev/null 
    30 -ENV=/dev/null 
    31 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
    32 -case $- in # (((( 
    33 -  *v*x* | *x*v* ) as_opts=-vx ;; 
    34 -  *v* ) as_opts=-v ;; 
    35 -  *x* ) as_opts=-x ;; 
    36 -  * ) as_opts= ;; 
    37 -esac 
    38 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 
    39 -# Admittedly, this is quite paranoid, since all the known shells bail 
    40 -# out after a failed `exec'. 
    41 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 
    42 -as_fn_exit 255 
    43 -  fi 
    44 -  # We don't want this to propagate to other subprocesses. 
    45 -          { _as_can_reexec=; unset _as_can_reexec;} 
    46  if test "x$CONFIG_SHELL" = x; then 
    47    as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : 
    48    emulate sh 
    49 @@ -190,8 +167,7 @@ if ( set x; as_fn_ret_success y && test  
    50  else 
    51    exitcode=1; echo positional parameters were not saved. 
    52  fi 
    53 -test x\$exitcode = x0 || exit 1 
    54 -test -x / || exit 1" 
    55 +test x\$exitcode = x0 || exit 1" 
    56    as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO 
    57    as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO 
    58    eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && 
    59 @@ -244,25 +220,21 @@ IFS=$as_save_IFS 
    60   
    61   
    62        if test "x$CONFIG_SHELL" != x; then : 
    63 -  export CONFIG_SHELL 
    64 -             # We cannot yet assume a decent shell, so we have to provide a 
    65 -# neutralization value for shells without unset; and this also 
    66 -# works around shells that cannot unset nonexistent variables. 
    67 -# Preserve -v and -x to the replacement shell. 
    68 -BASH_ENV=/dev/null 
    69 -ENV=/dev/null 
    70 -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
    71 -case $- in # (((( 
    72 -  *v*x* | *x*v* ) as_opts=-vx ;; 
    73 -  *v* ) as_opts=-v ;; 
    74 -  *x* ) as_opts=-x ;; 
    75 -  * ) as_opts= ;; 
    76 -esac 
    77 -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} 
    78 -# Admittedly, this is quite paranoid, since all the known shells bail 
    79 -# out after a failed `exec'. 
    80 -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 
    81 -exit 255 
    82 +  # We cannot yet assume a decent shell, so we have to provide a 
    83 +       # neutralization value for shells without unset; and this also 
    84 +       # works around shells that cannot unset nonexistent variables. 
    85 +       # Preserve -v and -x to the replacement shell. 
    86 +       BASH_ENV=/dev/null 
    87 +       ENV=/dev/null 
    88 +       (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 
    89 +       export CONFIG_SHELL 
    90 +       case $- in # (((( 
    91 +         *v*x* | *x*v* ) as_opts=-vx ;; 
    92 +         *v* ) as_opts=-v ;; 
    93 +         *x* ) as_opts=-x ;; 
    94 +         * ) as_opts= ;; 
    95 +       esac 
    96 +       exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 
    97  fi 
    98   
    99      if test x$as_have_required = xno; then : 
    100 @@ -364,14 +336,6 @@ $as_echo X"$as_dir" | 
    101   
    102   
    103  } # as_fn_mkdir_p 
    104 - 
    105 -# as_fn_executable_p FILE 
    106 -# ----------------------- 
    107 -# Test if FILE is an executable regular file. 
    108 -as_fn_executable_p () 
    109 -{ 
    110 -  test -f "$1" && test -x "$1" 
    111 -} # as_fn_executable_p 
    112  # as_fn_append VAR VALUE 
    113  # ---------------------- 
    114  # Append the text in VALUE to the end of the definition contained in VAR. Take 
    115 @@ -493,10 +457,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits 
    116    chmod +x "$as_me.lineno" || 
    117      { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } 
    118   
    119 -  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have 
    120 -  # already done that, so ensure we don't try to do so again and fall 
    121 -  # in an infinite loop.  This has already happened in practice. 
    122 -  _as_can_reexec=no; export _as_can_reexec 
    123    # Don't try to exec as it changes $[0], causing all sort of problems 
    124    # (the dirname of $[0] is not the place where we might find the 
    125    # original and so on.  Autoconf is especially sensitive to this). 
    126 @@ -531,16 +491,16 @@ if (echo >conf$$.file) 2>/dev/null; then 
    127      # ... but there are two gotchas: 
    128      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 
    129      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 
    130 -    # In both cases, we have to default to `cp -pR'. 
    131 +    # In both cases, we have to default to `cp -p'. 
    132      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 
    133 -      as_ln_s='cp -pR' 
    134 +      as_ln_s='cp -p' 
    135    elif ln conf$$.file conf$$ 2>/dev/null; then 
    136      as_ln_s=ln 
    137    else 
    138 -    as_ln_s='cp -pR' 
    139 +    as_ln_s='cp -p' 
    140    fi 
    141  else 
    142 -  as_ln_s='cp -pR' 
    143 +  as_ln_s='cp -p' 
    144  fi 
    145  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 
    146  rmdir conf$$.dir 2>/dev/null 
    147 @@ -552,8 +512,28 @@ else 
    148    as_mkdir_p=false 
    149  fi 
    150   
    151 -as_test_x='test -x' 
    152 -as_executable_p=as_fn_executable_p 
    153 +if test -x / >/dev/null 2>&1; then 
    154 +  as_test_x='test -x' 
    155 +else 
    156 +  if ls -dL / >/dev/null 2>&1; then 
    157 +    as_ls_L_option=L 
    158 +  else 
    159 +    as_ls_L_option= 
    160 +  fi 
    161 +  as_test_x=' 
    162 +    eval sh -c '\'' 
    163 +      if test -d "$1"; then 
    164 +       test -d "$1/."; 
    165 +      else 
    166 +       case $1 in #( 
    167 +       -*)set "./$1";; 
    168 +       esac; 
    169 +       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 
    170 +       ???[sx]*):;;*)false;;esac;fi 
    171 +    '\'' sh 
    172 +  ' 
    173 +fi 
    174 +as_executable_p=$as_test_x 
    175   
    176  # Sed expression to map a string onto a valid CPP name. 
    177  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 
    178 @@ -688,10 +668,6 @@ CPPFLAGS 
    179  LDFLAGS 
    180  CFLAGS 
    181  CC 
    182 -AM_BACKSLASH 
    183 -AM_DEFAULT_VERBOSITY 
    184 -AM_DEFAULT_V 
    185 -AM_V 
    186  am__untar 
    187  am__tar 
    188  AMTAR 
    189 @@ -756,7 +732,6 @@ SHELL' 
    190  ac_subst_files='' 
    191  ac_user_opts=' 
    192  enable_option_checking 
    193 -enable_silent_rules 
    194  enable_dependency_tracking 
    195  enable_static 
    196  enable_shared 
    197 @@ -1237,6 +1212,8 @@ target=$target_alias 
    198  if test "x$host_alias" != x; then 
    199    if test "x$build_alias" = x; then 
    200      cross_compiling=maybe 
    201 +    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 
    202 +    If a cross compiler is detected then cross compile mode will be used" >&2 
    203    elif test "x$build_alias" != "x$host_alias"; then 
    204      cross_compiling=yes 
    205    fi 
    206 @@ -1400,12 +1377,8 @@ Optional Features: 
    207    --disable-option-checking  ignore unrecognized --enable/--with options 
    208    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no) 
    209    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes] 
    210 -  --enable-silent-rules   less verbose build output (undo: "make V=1") 
    211 -  --disable-silent-rules  verbose build output (undo: "make V=0") 
    212 -  --enable-dependency-tracking 
    213 -                          do not reject slow dependency extractors 
    214 -  --disable-dependency-tracking 
    215 -                          speeds up one-time build 
    216 +  --disable-dependency-tracking  speeds up one-time build 
    217 +  --enable-dependency-tracking   do not reject slow dependency extractors 
    218    --enable-static[=PKGS]  build static libraries [default=no] 
    219    --enable-shared[=PKGS]  build shared libraries [default=yes] 
    220    --enable-fast-install[=PKGS] 
    221 @@ -1415,7 +1388,7 @@ Optional Features: 
    222  Optional Packages: 
    223    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes] 
    224    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no) 
    225 -  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use 
    226 +  --with-pic              try to use only PIC/non-PIC objects [default=use 
    227                            both] 
    228    --with-gnu-ld           assume the C compiler uses GNU ld [default=no] 
    229    --with-sysroot=DIR Search for dependent libraries within DIR 
    230 @@ -1512,9 +1485,9 @@ test -n "$ac_init_help" && exit $ac_stat 
    231  if $ac_init_version; then 
    232    cat <<\_ACEOF 
    233  xtables-addons configure 2.5 
    234 -generated by GNU Autoconf 2.69 
    235 +generated by GNU Autoconf 2.68 
    236   
    237 -Copyright (C) 2012 Free Software Foundation, Inc. 
    238 +Copyright (C) 2010 Free Software Foundation, Inc. 
    239  This configure script is free software; the Free Software Foundation 
    240  gives unlimited permission to copy, distribute and modify it. 
    241  _ACEOF 
    242 @@ -1590,7 +1563,7 @@ $as_echo "$ac_try_echo"; } >&5 
    243          test ! -s conftest.err 
    244         } && test -s conftest$ac_exeext && { 
    245          test "$cross_compiling" = yes || 
    246 -        test -x conftest$ac_exeext 
    247 +        $as_test_x conftest$ac_exeext 
    248         }; then : 
    249    ac_retval=0 
    250  else 
    251 @@ -1877,7 +1850,7 @@ This file contains any messages produced 
    252  running configure, to aid debugging if configure makes a mistake. 
    253   
    254  It was created by xtables-addons $as_me 2.5, which was 
    255 -generated by GNU Autoconf 2.69.  Invocation command line was 
    256 +generated by GNU Autoconf 2.68.  Invocation command line was 
    257   
    258    $ $0 $@ 
    259   
    260 @@ -2293,7 +2266,7 @@ case $as_dir/ in #(( 
    261      # by default. 
    262      for ac_prog in ginstall scoinst install; do 
    263        for ac_exec_ext in '' $ac_executable_extensions; do 
    264 -       if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then 
    265 +       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then 
    266           if test $ac_prog = install && 
    267             grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then 
    268             # AIX install.  It has an incompatible calling convention. 
    269 @@ -2349,10 +2322,13 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR 
    270   
    271  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' 
    272   
    273 -am__api_version='1.14' 
    274 +am__api_version='1.11' 
    275   
    276  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 
    277  $as_echo_n "checking whether build environment is sane... " >&6; } 
    278 +# Just in case 
    279 +sleep 1 
    280 +echo timestamp > conftest.file 
    281  # Reject unsafe characters in $srcdir or the absolute working directory 
    282  # name.  Accept space and tab only in the latter. 
    283  am_lf=' 
    284 @@ -2363,40 +2339,32 @@ case `pwd` in 
    285  esac 
    286  case $srcdir in 
    287    *[\\\"\#\$\&\'\`$am_lf\ \    ]*) 
    288 -    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; 
    289 +    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; 
    290  esac 
    291   
    292 -# Do 'set' in a subshell so we don't clobber the current shell's 
    293 +# Do `set' in a subshell so we don't clobber the current shell's 
    294  # arguments.  Must try -L first in case configure is actually a 
    295  # symlink; some systems play weird games with the mod time of symlinks 
    296  # (eg FreeBSD returns the mod time of the symlink's containing 
    297  # directory). 
    298  if ( 
    299 -   am_has_slept=no 
    300 -   for am_try in 1 2; do 
    301 -     echo "timestamp, slept: $am_has_slept" > conftest.file 
    302 -     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` 
    303 -     if test "$*" = "X"; then 
    304 -       # -L didn't work. 
    305 -       set X `ls -t "$srcdir/configure" conftest.file` 
    306 -     fi 
    307 -     if test "$*" != "X $srcdir/configure conftest.file" \ 
    308 -       && test "$*" != "X conftest.file $srcdir/configure"; then 
    309 +   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` 
    310 +   if test "$*" = "X"; then 
    311 +      # -L didn't work. 
    312 +      set X `ls -t "$srcdir/configure" conftest.file` 
    313 +   fi 
    314 +   rm -f conftest.file 
    315 +   if test "$*" != "X $srcdir/configure conftest.file" \ 
    316 +      && test "$*" != "X conftest.file $srcdir/configure"; then 
    317 + 
    318 +      # If neither matched, then we have a broken ls.  This can happen 
    319 +      # if, for instance, CONFIG_SHELL is bash and it inherits a 
    320 +      # broken ls alias from the environment.  This has actually 
    321 +      # happened.  Such a system could not be considered "sane". 
    322 +      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken 
    323 +alias in your environment" "$LINENO" 5 
    324 +   fi 
    325   
    326 -       # If neither matched, then we have a broken ls.  This can happen 
    327 -       # if, for instance, CONFIG_SHELL is bash and it inherits a 
    328 -       # broken ls alias from the environment.  This has actually 
    329 -       # happened.  Such a system could not be considered "sane". 
    330 -       as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken 
    331 -  alias in your environment" "$LINENO" 5 
    332 -     fi 
    333 -     if test "$2" = conftest.file || test $am_try -eq 2; then 
    334 -       break 
    335 -     fi 
    336 -     # Just in case. 
    337 -     sleep 1 
    338 -     am_has_slept=yes 
    339 -   done 
    340     test "$2" = conftest.file 
    341     ) 
    342  then 
    343 @@ -2408,16 +2376,6 @@ Check your system clock" "$LINENO" 5 
    344  fi 
    345  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    346  $as_echo "yes" >&6; } 
    347 -# If we didn't sleep, we still need to ensure time stamps of config.status and 
    348 -# generated files are strictly newer. 
    349 -am_sleep_pid= 
    350 -if grep 'slept: no' conftest.file >/dev/null 2>&1; then 
    351 -  ( sleep 1 ) & 
    352 -  am_sleep_pid=$! 
    353 -fi 
    354 - 
    355 -rm -f conftest.file 
    356 - 
    357  test "$program_prefix" != NONE && 
    358    program_transform_name="s&^&$program_prefix&;$program_transform_name" 
    359  # Use a double $ so make ignores it. 
    360 @@ -2440,12 +2398,12 @@ if test x"${MISSING+set}" != xset; then 
    361    esac 
    362  fi 
    363  # Use eval to expand $SHELL 
    364 -if eval "$MISSING --is-lightweight"; then 
    365 -  am_missing_run="$MISSING " 
    366 +if eval "$MISSING --run true"; then 
    367 +  am_missing_run="$MISSING --run " 
    368  else 
    369    am_missing_run= 
    370 -  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 
    371 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} 
    372 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 
    373 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} 
    374  fi 
    375   
    376  if test x"${install_sh}" != xset; then 
    377 @@ -2457,10 +2415,10 @@ if test x"${install_sh}" != xset; then 
    378    esac 
    379  fi 
    380   
    381 -# Installed binaries are usually stripped using 'strip' when the user 
    382 -# run "make install-strip".  However 'strip' might not be the right 
    383 +# Installed binaries are usually stripped using `strip' when the user 
    384 +# run `make install-strip'.  However `strip' might not be the right 
    385  # tool to use in cross-compilation environments, therefore Automake 
    386 -# will honor the 'STRIP' environment variable to overrule this program. 
    387 +# will honor the `STRIP' environment variable to overrule this program. 
    388  if test "$cross_compiling" != no; then 
    389    if test -n "$ac_tool_prefix"; then 
    390    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 
    391 @@ -2479,7 +2437,7 @@ do 
    392    IFS=$as_save_IFS 
    393    test -z "$as_dir" && as_dir=. 
    394      for ac_exec_ext in '' $ac_executable_extensions; do 
    395 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    396 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    397      ac_cv_prog_STRIP="${ac_tool_prefix}strip" 
    398      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    399      break 2 
    400 @@ -2519,7 +2477,7 @@ do 
    401    IFS=$as_save_IFS 
    402    test -z "$as_dir" && as_dir=. 
    403      for ac_exec_ext in '' $ac_executable_extensions; do 
    404 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    405 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    406      ac_cv_prog_ac_ct_STRIP="strip" 
    407      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    408      break 2 
    409 @@ -2570,7 +2528,7 @@ do 
    410    test -z "$as_dir" && as_dir=. 
    411      for ac_prog in mkdir gmkdir; do 
    412          for ac_exec_ext in '' $ac_executable_extensions; do 
    413 -          as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue 
    414 +          { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue 
    415            case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 
    416              'mkdir (GNU coreutils) '* | \ 
    417              'mkdir (coreutils) '* | \ 
    418 @@ -2599,6 +2557,12 @@ fi 
    419  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 
    420  $as_echo "$MKDIR_P" >&6; } 
    421   
    422 +mkdir_p="$MKDIR_P" 
    423 +case $mkdir_p in 
    424 +  [\\/$]* | ?:[\\/]*) ;; 
    425 +  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; 
    426 +esac 
    427 + 
    428  for ac_prog in gawk mawk nawk awk 
    429  do 
    430    # Extract the first word of "$ac_prog", so it can be a program name with args. 
    431 @@ -2617,7 +2581,7 @@ do 
    432    IFS=$as_save_IFS 
    433    test -z "$as_dir" && as_dir=. 
    434      for ac_exec_ext in '' $ac_executable_extensions; do 
    435 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    436 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    437      ac_cv_prog_AWK="$ac_prog" 
    438      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    439      break 2 
    440 @@ -2681,45 +2645,6 @@ else 
    441  fi 
    442  rmdir .tst 2>/dev/null 
    443   
    444 -# Check whether --enable-silent-rules was given. 
    445 -if test "${enable_silent_rules+set}" = set; then : 
    446 -  enableval=$enable_silent_rules; 
    447 -fi 
    448 - 
    449 -case $enable_silent_rules in # ((( 
    450 -  yes) AM_DEFAULT_VERBOSITY=0;; 
    451 -   no) AM_DEFAULT_VERBOSITY=1;; 
    452 -    *) AM_DEFAULT_VERBOSITY=1;; 
    453 -esac 
    454 -am_make=${MAKE-make} 
    455 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 
    456 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } 
    457 -if ${am_cv_make_support_nested_variables+:} false; then : 
    458 -  $as_echo_n "(cached) " >&6 
    459 -else 
    460 -  if $as_echo 'TRUE=$(BAR$(V)) 
    461 -BAR0=false 
    462 -BAR1=true 
    463 -V=1 
    464 -am__doit: 
    465 -       @$(TRUE) 
    466 -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then 
    467 -  am_cv_make_support_nested_variables=yes 
    468 -else 
    469 -  am_cv_make_support_nested_variables=no 
    470 -fi 
    471 -fi 
    472 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 
    473 -$as_echo "$am_cv_make_support_nested_variables" >&6; } 
    474 -if test $am_cv_make_support_nested_variables = yes; then 
    475 -    AM_V='$(V)' 
    476 -  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' 
    477 -else 
    478 -  AM_V=$AM_DEFAULT_VERBOSITY 
    479 -  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY 
    480 -fi 
    481 -AM_BACKSLASH='\' 
    482 - 
    483  if test "`cd $srcdir && pwd`" != "`pwd`"; then 
    484    # Use -I$(srcdir) only when $(srcdir) != ., so that make's output 
    485    # is not polluted with repeated "-I." 
    486 @@ -2770,111 +2695,18 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru 
    487   
    488  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} 
    489   
    490 -# For better backward compatibility.  To be removed once Automake 1.9.x 
    491 -# dies out for good.  For more background, see: 
    492 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 
    493 -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 
    494 -mkdir_p='$(MKDIR_P)' 
    495 - 
    496  # We need awk for the "check" target.  The system "awk" is bad on 
    497  # some platforms. 
    498  # Always define AMTAR for backward compatibility.  Yes, it's still used 
    499  # in the wild :-(  We should find a proper way to deprecate it ... 
    500  AMTAR='$${TAR-tar}' 
    501   
    502 - 
    503 -# We'll loop over all known methods to create a tar archive until one works. 
    504 -_am_tools='gnutar  pax cpio none' 
    505 - 
    506  am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' 
    507   
    508   
    509   
    510   
    511   
    512 - 
    513 -# POSIX will say in a future version that running "rm -f" with no argument 
    514 -# is OK; and we want to be able to make that assumption in our Makefile 
    515 -# recipes.  So use an aggressive probe to check that the usage we want is 
    516 -# actually supported "in the wild" to an acceptable degree. 
    517 -# See automake bug#10828. 
    518 -# To make any issue more visible, cause the running configure to be aborted 
    519 -# by default if the 'rm' program in use doesn't match our expectations; the 
    520 -# user can still override this though. 
    521 -if rm -f && rm -fr && rm -rf; then : OK; else 
    522 -  cat >&2 <<'END' 
    523 -Oops! 
    524 - 
    525 -Your 'rm' program seems unable to run without file operands specified 
    526 -on the command line, even when the '-f' option is present.  This is contrary 
    527 -to the behaviour of most rm programs out there, and not conforming with 
    528 -the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> 
    529 - 
    530 -Please tell bug-automake@gnu.org about your system, including the value 
    531 -of your $PATH and any error possibly output before this message.  This 
    532 -can help us improve future automake versions. 
    533 - 
    534 -END 
    535 -  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then 
    536 -    echo 'Configuration will proceed anyway, since you have set the' >&2 
    537 -    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 
    538 -    echo >&2 
    539 -  else 
    540 -    cat >&2 <<'END' 
    541 -Aborting the configuration process, to ensure you take notice of the issue. 
    542 - 
    543 -You can download and install GNU coreutils to get an 'rm' implementation 
    544 -that behaves properly: <http://www.gnu.org/software/coreutils/>. 
    545 - 
    546 -If you want to complete the configuration process using your problematic 
    547 -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM 
    548 -to "yes", and re-run configure. 
    549 - 
    550 -END 
    551 -    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 
    552 -  fi 
    553 -fi 
    554 - 
    555 -# Check whether --enable-silent-rules was given. 
    556 -if test "${enable_silent_rules+set}" = set; then : 
    557 -  enableval=$enable_silent_rules; 
    558 -fi 
    559 - 
    560 -case $enable_silent_rules in # ((( 
    561 -  yes) AM_DEFAULT_VERBOSITY=0;; 
    562 -   no) AM_DEFAULT_VERBOSITY=1;; 
    563 -    *) AM_DEFAULT_VERBOSITY=0;; 
    564 -esac 
    565 -am_make=${MAKE-make} 
    566 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 
    567 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } 
    568 -if ${am_cv_make_support_nested_variables+:} false; then : 
    569 -  $as_echo_n "(cached) " >&6 
    570 -else 
    571 -  if $as_echo 'TRUE=$(BAR$(V)) 
    572 -BAR0=false 
    573 -BAR1=true 
    574 -V=1 
    575 -am__doit: 
    576 -       @$(TRUE) 
    577 -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then 
    578 -  am_cv_make_support_nested_variables=yes 
    579 -else 
    580 -  am_cv_make_support_nested_variables=no 
    581 -fi 
    582 -fi 
    583 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 
    584 -$as_echo "$am_cv_make_support_nested_variables" >&6; } 
    585 -if test $am_cv_make_support_nested_variables = yes; then 
    586 -    AM_V='$(V)' 
    587 -  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' 
    588 -else 
    589 -  AM_V=$AM_DEFAULT_VERBOSITY 
    590 -  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY 
    591 -fi 
    592 -AM_BACKSLASH='\' 
    593 - 
    594 - 
    595  ac_ext=c 
    596  ac_cpp='$CPP $CPPFLAGS' 
    597  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 
    598 @@ -2897,7 +2729,7 @@ do 
    599    IFS=$as_save_IFS 
    600    test -z "$as_dir" && as_dir=. 
    601      for ac_exec_ext in '' $ac_executable_extensions; do 
    602 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    603 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    604      ac_cv_prog_CC="${ac_tool_prefix}gcc" 
    605      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    606      break 2 
    607 @@ -2937,7 +2769,7 @@ do 
    608    IFS=$as_save_IFS 
    609    test -z "$as_dir" && as_dir=. 
    610      for ac_exec_ext in '' $ac_executable_extensions; do 
    611 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    612 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    613      ac_cv_prog_ac_ct_CC="gcc" 
    614      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    615      break 2 
    616 @@ -2990,7 +2822,7 @@ do 
    617    IFS=$as_save_IFS 
    618    test -z "$as_dir" && as_dir=. 
    619      for ac_exec_ext in '' $ac_executable_extensions; do 
    620 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    621 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    622      ac_cv_prog_CC="${ac_tool_prefix}cc" 
    623      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    624      break 2 
    625 @@ -3031,7 +2863,7 @@ do 
    626    IFS=$as_save_IFS 
    627    test -z "$as_dir" && as_dir=. 
    628      for ac_exec_ext in '' $ac_executable_extensions; do 
    629 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    630 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    631      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then 
    632         ac_prog_rejected=yes 
    633         continue 
    634 @@ -3089,7 +2921,7 @@ do 
    635    IFS=$as_save_IFS 
    636    test -z "$as_dir" && as_dir=. 
    637      for ac_exec_ext in '' $ac_executable_extensions; do 
    638 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    639 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    640      ac_cv_prog_CC="$ac_tool_prefix$ac_prog" 
    641      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    642      break 2 
    643 @@ -3133,7 +2965,7 @@ do 
    644    IFS=$as_save_IFS 
    645    test -z "$as_dir" && as_dir=. 
    646      for ac_exec_ext in '' $ac_executable_extensions; do 
    647 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    648 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    649      ac_cv_prog_ac_ct_CC="$ac_prog" 
    650      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    651      break 2 
    652 @@ -3579,7 +3411,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ 
    653  /* end confdefs.h.  */ 
    654  #include <stdarg.h> 
    655  #include <stdio.h> 
    656 -struct stat; 
    657 +#include <sys/types.h> 
    658 +#include <sys/stat.h> 
    659  /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */ 
    660  struct buf { int x; }; 
    661  FILE * (*rcsopen) (struct buf *, struct stat *, int); 
    662 @@ -3663,65 +3496,6 @@ ac_cpp='$CPP $CPPFLAGS' 
    663  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 
    664  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 
    665  ac_compiler_gnu=$ac_cv_c_compiler_gnu 
    666 - 
    667 -ac_ext=c 
    668 -ac_cpp='$CPP $CPPFLAGS' 
    669 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 
    670 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 
    671 -ac_compiler_gnu=$ac_cv_c_compiler_gnu 
    672 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 
    673 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } 
    674 -if ${am_cv_prog_cc_c_o+:} false; then : 
    675 -  $as_echo_n "(cached) " >&6 
    676 -else 
    677 -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    678 -/* end confdefs.h.  */ 
    679 - 
    680 -int 
    681 -main () 
    682 -{ 
    683 - 
    684 -  ; 
    685 -  return 0; 
    686 -} 
    687 -_ACEOF 
    688 -  # Make sure it works both with $CC and with simple cc. 
    689 -  # Following AC_PROG_CC_C_O, we do the test twice because some 
    690 -  # compilers refuse to overwrite an existing .o file with -o, 
    691 -  # though they will create one. 
    692 -  am_cv_prog_cc_c_o=yes 
    693 -  for am_i in 1 2; do 
    694 -    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 
    695 -   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 
    696 -   ac_status=$? 
    697 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    698 -   (exit $ac_status); } \ 
    699 -         && test -f conftest2.$ac_objext; then 
    700 -      : OK 
    701 -    else 
    702 -      am_cv_prog_cc_c_o=no 
    703 -      break 
    704 -    fi 
    705 -  done 
    706 -  rm -f core conftest* 
    707 -  unset am_i 
    708 -fi 
    709 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 
    710 -$as_echo "$am_cv_prog_cc_c_o" >&6; } 
    711 -if test "$am_cv_prog_cc_c_o" != yes; then 
    712 -   # Losing compiler, so override with the script. 
    713 -   # FIXME: It is wrong to rewrite CC. 
    714 -   # But if we don't then we get into trouble of one sort or another. 
    715 -   # A longer-term fix would be to have automake use am__CC in this case, 
    716 -   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" 
    717 -   CC="$am_aux_dir/compile $CC" 
    718 -fi 
    719 -ac_ext=c 
    720 -ac_cpp='$CPP $CPPFLAGS' 
    721 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 
    722 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 
    723 -ac_compiler_gnu=$ac_cv_c_compiler_gnu 
    724 - 
    725  DEPDIR="${am__leading_dot}deps" 
    726   
    727  ac_config_commands="$ac_config_commands depfiles" 
    728 @@ -3741,7 +3515,7 @@ am__quote= 
    729  _am_result=none 
    730  # First try GNU make style include. 
    731  echo "include confinc" > confmf 
    732 -# Ignore all kinds of additional output from 'make'. 
    733 +# Ignore all kinds of additional output from `make'. 
    734  case `$am_make -s -f confmf 2> /dev/null` in #( 
    735  *the\ am__doit\ target*) 
    736    am__include=include 
    737 @@ -3797,8 +3571,8 @@ else 
    738    # We make a subdir and do the tests there.  Otherwise we can end up 
    739    # making bogus files that we don't know about and never remove.  For 
    740    # instance it was reported that on HP-UX the gcc test will end up 
    741 -  # making a dummy file named 'D' -- because '-MD' means "put the output 
    742 -  # in D". 
    743 +  # making a dummy file named `D' -- because `-MD' means `put the output 
    744 +  # in D'. 
    745    rm -rf conftest.dir 
    746    mkdir conftest.dir 
    747    # Copy depcomp to subdir because otherwise we won't find it if we're 
    748 @@ -3833,16 +3607,16 @@ else 
    749      : > sub/conftest.c 
    750      for i in 1 2 3 4 5 6; do 
    751        echo '#include "conftst'$i'.h"' >> sub/conftest.c 
    752 -      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with 
    753 -      # Solaris 10 /bin/sh. 
    754 -      echo '/* dummy */' > sub/conftst$i.h 
    755 +      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with 
    756 +      # Solaris 8's {/usr,}/bin/sh. 
    757 +      touch sub/conftst$i.h 
    758      done 
    759      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf 
    760   
    761 -    # We check with '-c' and '-o' for the sake of the "dashmstdout" 
    762 +    # We check with `-c' and `-o' for the sake of the "dashmstdout" 
    763      # mode.  It turns out that the SunPro C++ compiler does not properly 
    764 -    # handle '-M -o', and we need to detect this.  Also, some Intel 
    765 -    # versions had trouble with output in subdirs. 
    766 +    # handle `-M -o', and we need to detect this.  Also, some Intel 
    767 +    # versions had trouble with output in subdirs 
    768      am__obj=sub/conftest.${OBJEXT-o} 
    769      am__minus_obj="-o $am__obj" 
    770      case $depmode in 
    771 @@ -3851,8 +3625,8 @@ else 
    772        test "$am__universal" = false || continue 
    773        ;; 
    774      nosideeffect) 
    775 -      # After this tag, mechanisms are not by side-effect, so they'll 
    776 -      # only be used when explicitly requested. 
    777 +      # after this tag, mechanisms are not by side-effect, so they'll 
    778 +      # only be used when explicitly requested 
    779        if test "x$enable_dependency_tracking" = xyes; then 
    780         continue 
    781        else 
    782 @@ -3860,7 +3634,7 @@ else 
    783        fi 
    784        ;; 
    785      msvc7 | msvc7msys | msvisualcpp | msvcmsys) 
    786 -      # This compiler won't grok '-c -o', but also, the minuso test has 
    787 +      # This compiler won't grok `-c -o', but also, the minuso test has 
    788        # not run yet.  These depmodes are late enough in the game, and 
    789        # so weak that their functioning should not be impacted. 
    790        am__obj=conftest.${OBJEXT-o} 
    791 @@ -3914,6 +3688,131 @@ else 
    792  fi 
    793   
    794   
    795 +if test "x$CC" != xcc; then 
    796 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 
    797 +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } 
    798 +else 
    799 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 
    800 +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } 
    801 +fi 
    802 +set dummy $CC; ac_cc=`$as_echo "$2" | 
    803 +                     sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` 
    804 +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : 
    805 +  $as_echo_n "(cached) " >&6 
    806 +else 
    807 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    808 +/* end confdefs.h.  */ 
    809 + 
    810 +int 
    811 +main () 
    812 +{ 
    813 + 
    814 +  ; 
    815 +  return 0; 
    816 +} 
    817 +_ACEOF 
    818 +# Make sure it works both with $CC and with simple cc. 
    819 +# We do the test twice because some compilers refuse to overwrite an 
    820 +# existing .o file with -o, though they will create one. 
    821 +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 
    822 +rm -f conftest2.* 
    823 +if { { case "(($ac_try" in 
    824 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 
    825 +  *) ac_try_echo=$ac_try;; 
    826 +esac 
    827 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 
    828 +$as_echo "$ac_try_echo"; } >&5 
    829 +  (eval "$ac_try") 2>&5 
    830 +  ac_status=$? 
    831 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    832 +  test $ac_status = 0; } && 
    833 +   test -f conftest2.$ac_objext && { { case "(($ac_try" in 
    834 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 
    835 +  *) ac_try_echo=$ac_try;; 
    836 +esac 
    837 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 
    838 +$as_echo "$ac_try_echo"; } >&5 
    839 +  (eval "$ac_try") 2>&5 
    840 +  ac_status=$? 
    841 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    842 +  test $ac_status = 0; }; 
    843 +then 
    844 +  eval ac_cv_prog_cc_${ac_cc}_c_o=yes 
    845 +  if test "x$CC" != xcc; then 
    846 +    # Test first that cc exists at all. 
    847 +    if { ac_try='cc -c conftest.$ac_ext >&5' 
    848 +  { { case "(($ac_try" in 
    849 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 
    850 +  *) ac_try_echo=$ac_try;; 
    851 +esac 
    852 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 
    853 +$as_echo "$ac_try_echo"; } >&5 
    854 +  (eval "$ac_try") 2>&5 
    855 +  ac_status=$? 
    856 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    857 +  test $ac_status = 0; }; }; then 
    858 +      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' 
    859 +      rm -f conftest2.* 
    860 +      if { { case "(($ac_try" in 
    861 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 
    862 +  *) ac_try_echo=$ac_try;; 
    863 +esac 
    864 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 
    865 +$as_echo "$ac_try_echo"; } >&5 
    866 +  (eval "$ac_try") 2>&5 
    867 +  ac_status=$? 
    868 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    869 +  test $ac_status = 0; } && 
    870 +        test -f conftest2.$ac_objext && { { case "(($ac_try" in 
    871 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 
    872 +  *) ac_try_echo=$ac_try;; 
    873 +esac 
    874 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" 
    875 +$as_echo "$ac_try_echo"; } >&5 
    876 +  (eval "$ac_try") 2>&5 
    877 +  ac_status=$? 
    878 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    879 +  test $ac_status = 0; }; 
    880 +      then 
    881 +       # cc works too. 
    882 +       : 
    883 +      else 
    884 +       # cc exists but doesn't like -o. 
    885 +       eval ac_cv_prog_cc_${ac_cc}_c_o=no 
    886 +      fi 
    887 +    fi 
    888 +  fi 
    889 +else 
    890 +  eval ac_cv_prog_cc_${ac_cc}_c_o=no 
    891 +fi 
    892 +rm -f core conftest* 
    893 + 
    894 +fi 
    895 +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then 
    896 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 
    897 +$as_echo "yes" >&6; } 
    898 +else 
    899 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 
    900 +$as_echo "no" >&6; } 
    901 + 
    902 +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h 
    903 + 
    904 +fi 
    905 + 
    906 +# FIXME: we rely on the cache variable name because 
    907 +# there is no other way. 
    908 +set dummy $CC 
    909 +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` 
    910 +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o 
    911 +if test "$am_t" != yes; then 
    912 +   # Losing compiler, so override with the script. 
    913 +   # FIXME: It is wrong to rewrite CC. 
    914 +   # But if we don't then we get into trouble of one sort or another. 
    915 +   # A longer-term fix would be to have automake use am__CC in this case, 
    916 +   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" 
    917 +   CC="$am_aux_dir/compile $CC" 
    918 +fi 
    919 + 
    920   
    921   
    922  if test -n "$ac_tool_prefix"; then 
    923 @@ -3935,7 +3834,7 @@ do 
    924    IFS=$as_save_IFS 
    925    test -z "$as_dir" && as_dir=. 
    926      for ac_exec_ext in '' $ac_executable_extensions; do 
    927 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    928 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    929      ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 
    930      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    931      break 2 
    932 @@ -3979,7 +3878,7 @@ do 
    933    IFS=$as_save_IFS 
    934    test -z "$as_dir" && as_dir=. 
    935      for ac_exec_ext in '' $ac_executable_extensions; do 
    936 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    937 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    938      ac_cv_prog_ac_ct_AR="$ac_prog" 
    939      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    940      break 2 
    941 @@ -4023,13 +3922,7 @@ $as_echo_n "checking the archiver ($AR)  
    942  if ${am_cv_ar_interface+:} false; then : 
    943    $as_echo_n "(cached) " >&6 
    944  else 
    945 -  ac_ext=c 
    946 -ac_cpp='$CPP $CPPFLAGS' 
    947 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 
    948 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 
    949 -ac_compiler_gnu=$ac_cv_c_compiler_gnu 
    950 - 
    951 -   am_cv_ar_interface=ar 
    952 +  am_cv_ar_interface=ar 
    953     cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
    954  /* end confdefs.h.  */ 
    955  int some_variable = 0; 
    956 @@ -4060,11 +3953,6 @@ if ac_fn_c_try_compile "$LINENO"; then : 
    957   
    958  fi 
    959  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 
    960 -   ac_ext=c 
    961 -ac_cpp='$CPP $CPPFLAGS' 
    962 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 
    963 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 
    964 -ac_compiler_gnu=$ac_cv_c_compiler_gnu 
    965   
    966  fi 
    967  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 
    968 @@ -4126,8 +4014,8 @@ esac 
    969   
    970   
    971   
    972 -macro_version='2.4.2' 
    973 -macro_revision='1.3337' 
    974 +macro_version='2.4' 
    975 +macro_revision='1.3293' 
    976   
    977   
    978   
    979 @@ -4305,7 +4193,7 @@ do 
    980      for ac_prog in sed gsed; do 
    981      for ac_exec_ext in '' $ac_executable_extensions; do 
    982        ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" 
    983 -      as_fn_executable_p "$ac_path_SED" || continue 
    984 +      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue 
    985  # Check for GNU ac_path_SED and select it if it is found. 
    986    # Check for GNU $ac_path_SED 
    987  case `"$ac_path_SED" --version 2>&1` in 
    988 @@ -4381,7 +4269,7 @@ do 
    989      for ac_prog in grep ggrep; do 
    990      for ac_exec_ext in '' $ac_executable_extensions; do 
    991        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" 
    992 -      as_fn_executable_p "$ac_path_GREP" || continue 
    993 +      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue 
    994  # Check for GNU ac_path_GREP and select it if it is found. 
    995    # Check for GNU $ac_path_GREP 
    996  case `"$ac_path_GREP" --version 2>&1` in 
    997 @@ -4447,7 +4335,7 @@ do 
    998      for ac_prog in egrep; do 
    999      for ac_exec_ext in '' $ac_executable_extensions; do 
    1000        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" 
    1001 -      as_fn_executable_p "$ac_path_EGREP" || continue 
    1002 +      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue 
    1003  # Check for GNU ac_path_EGREP and select it if it is found. 
    1004    # Check for GNU $ac_path_EGREP 
    1005  case `"$ac_path_EGREP" --version 2>&1` in 
    1006 @@ -4514,7 +4402,7 @@ do 
    1007      for ac_prog in fgrep; do 
    1008      for ac_exec_ext in '' $ac_executable_extensions; do 
    1009        ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" 
    1010 -      as_fn_executable_p "$ac_path_FGREP" || continue 
    1011 +      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue 
    1012  # Check for GNU ac_path_FGREP and select it if it is found. 
    1013    # Check for GNU $ac_path_FGREP 
    1014  case `"$ac_path_FGREP" --version 2>&1` in 
    1015 @@ -4770,7 +4658,7 @@ do 
    1016    IFS=$as_save_IFS 
    1017    test -z "$as_dir" && as_dir=. 
    1018      for ac_exec_ext in '' $ac_executable_extensions; do 
    1019 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1020 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1021      ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" 
    1022      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1023      break 2 
    1024 @@ -4814,7 +4702,7 @@ do 
    1025    IFS=$as_save_IFS 
    1026    test -z "$as_dir" && as_dir=. 
    1027      for ac_exec_ext in '' $ac_executable_extensions; do 
    1028 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1029 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1030      ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" 
    1031      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1032      break 2 
    1033 @@ -4972,11 +4860,6 @@ else 
    1034      lt_cv_sys_max_cmd_len=196608 
    1035      ;; 
    1036   
    1037 -  os2*) 
    1038 -    # The test takes a long time on OS/2. 
    1039 -    lt_cv_sys_max_cmd_len=8192 
    1040 -    ;; 
    1041 - 
    1042    osf*) 
    1043      # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure 
    1044      # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not 
    1045 @@ -5016,7 +4899,7 @@ else 
    1046        # If test is not a shell built-in, we'll probably end up computing a 
    1047        # maximum length that is only half of the actual maximum length, but 
    1048        # we can't tell. 
    1049 -      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ 
    1050 +      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ 
    1051                  = "X$teststring$teststring"; } >/dev/null 2>&1 && 
    1052               test $i != 17 # 1/2 MB should be enough 
    1053        do 
    1054 @@ -5238,7 +5121,7 @@ do 
    1055    IFS=$as_save_IFS 
    1056    test -z "$as_dir" && as_dir=. 
    1057      for ac_exec_ext in '' $ac_executable_extensions; do 
    1058 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1059 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1060      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" 
    1061      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1062      break 2 
    1063 @@ -5278,7 +5161,7 @@ do 
    1064    IFS=$as_save_IFS 
    1065    test -z "$as_dir" && as_dir=. 
    1066      for ac_exec_ext in '' $ac_executable_extensions; do 
    1067 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1068 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1069      ac_cv_prog_ac_ct_OBJDUMP="objdump" 
    1070      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1071      break 2 
    1072 @@ -5445,7 +5328,7 @@ irix5* | irix6* | nonstopux*) 
    1073    lt_cv_deplibs_check_method=pass_all 
    1074    ;; 
    1075   
    1076 -# This must be glibc/ELF. 
    1077 +# This must be Linux ELF. 
    1078  linux* | k*bsd*-gnu | kopensolaris*-gnu) 
    1079    lt_cv_deplibs_check_method=pass_all 
    1080    ;; 
    1081 @@ -5584,7 +5467,7 @@ do 
    1082    IFS=$as_save_IFS 
    1083    test -z "$as_dir" && as_dir=. 
    1084      for ac_exec_ext in '' $ac_executable_extensions; do 
    1085 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1086 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1087      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" 
    1088      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1089      break 2 
    1090 @@ -5624,7 +5507,7 @@ do 
    1091    IFS=$as_save_IFS 
    1092    test -z "$as_dir" && as_dir=. 
    1093      for ac_exec_ext in '' $ac_executable_extensions; do 
    1094 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1095 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1096      ac_cv_prog_ac_ct_DLLTOOL="dlltool" 
    1097      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1098      break 2 
    1099 @@ -5727,7 +5610,7 @@ do 
    1100    IFS=$as_save_IFS 
    1101    test -z "$as_dir" && as_dir=. 
    1102      for ac_exec_ext in '' $ac_executable_extensions; do 
    1103 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1104 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1105      ac_cv_prog_AR="$ac_tool_prefix$ac_prog" 
    1106      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1107      break 2 
    1108 @@ -5771,7 +5654,7 @@ do 
    1109    IFS=$as_save_IFS 
    1110    test -z "$as_dir" && as_dir=. 
    1111      for ac_exec_ext in '' $ac_executable_extensions; do 
    1112 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1113 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1114      ac_cv_prog_ac_ct_AR="$ac_prog" 
    1115      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1116      break 2 
    1117 @@ -5896,7 +5779,7 @@ do 
    1118    IFS=$as_save_IFS 
    1119    test -z "$as_dir" && as_dir=. 
    1120      for ac_exec_ext in '' $ac_executable_extensions; do 
    1121 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1122 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1123      ac_cv_prog_STRIP="${ac_tool_prefix}strip" 
    1124      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1125      break 2 
    1126 @@ -5936,7 +5819,7 @@ do 
    1127    IFS=$as_save_IFS 
    1128    test -z "$as_dir" && as_dir=. 
    1129      for ac_exec_ext in '' $ac_executable_extensions; do 
    1130 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1131 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1132      ac_cv_prog_ac_ct_STRIP="strip" 
    1133      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1134      break 2 
    1135 @@ -5995,7 +5878,7 @@ do 
    1136    IFS=$as_save_IFS 
    1137    test -z "$as_dir" && as_dir=. 
    1138      for ac_exec_ext in '' $ac_executable_extensions; do 
    1139 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1140 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1141      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" 
    1142      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1143      break 2 
    1144 @@ -6035,7 +5918,7 @@ do 
    1145    IFS=$as_save_IFS 
    1146    test -z "$as_dir" && as_dir=. 
    1147      for ac_exec_ext in '' $ac_executable_extensions; do 
    1148 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1149 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1150      ac_cv_prog_ac_ct_RANLIB="ranlib" 
    1151      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1152      break 2 
    1153 @@ -6085,13 +5968,13 @@ old_postuninstall_cmds= 
    1154  if test -n "$RANLIB"; then 
    1155    case $host_os in 
    1156    openbsd*) 
    1157 -    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" 
    1158 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" 
    1159      ;; 
    1160    *) 
    1161 -    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" 
    1162 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" 
    1163      ;; 
    1164    esac 
    1165 -  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" 
    1166 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" 
    1167  fi 
    1168   
    1169  case $host_os in 
    1170 @@ -6238,7 +6121,6 @@ for ac_symprfx in "" "_"; do 
    1171      # which start with @ or ?. 
    1172      lt_cv_sys_global_symbol_pipe="$AWK '"\ 
    1173  "     {last_section=section; section=\$ 3};"\ 
    1174 -"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ 
    1175  "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ 
    1176  "     \$ 0!~/External *\|/{next};"\ 
    1177  "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ 
    1178 @@ -6627,7 +6509,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } 
    1179      CFLAGS="$SAVE_CFLAGS" 
    1180    fi 
    1181    ;; 
    1182 -*-*solaris*) 
    1183 +sparc*-*solaris*) 
    1184    # Find out which ABI we are using. 
    1185    echo 'int i;' > conftest.$ac_ext 
    1186    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 
    1187 @@ -6638,20 +6520,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } 
    1188      case `/usr/bin/file conftest.o` in 
    1189      *64-bit*) 
    1190        case $lt_cv_prog_gnu_ld in 
    1191 -      yes*) 
    1192 -        case $host in 
    1193 -        i?86-*-solaris*) 
    1194 -          LD="${LD-ld} -m elf_x86_64" 
    1195 -          ;; 
    1196 -        sparc*-*-solaris*) 
    1197 -          LD="${LD-ld} -m elf64_sparc" 
    1198 -          ;; 
    1199 -        esac 
    1200 -        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available. 
    1201 -        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then 
    1202 -          LD="${LD-ld}_sol2" 
    1203 -        fi 
    1204 -        ;; 
    1205 +      yes*) LD="${LD-ld} -m elf64_sparc" ;; 
    1206        *) 
    1207         if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then 
    1208           LD="${LD-ld} -64" 
    1209 @@ -6684,7 +6553,7 @@ do 
    1210    IFS=$as_save_IFS 
    1211    test -z "$as_dir" && as_dir=. 
    1212      for ac_exec_ext in '' $ac_executable_extensions; do 
    1213 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1214 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1215      ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" 
    1216      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1217      break 2 
    1218 @@ -6724,7 +6593,7 @@ do 
    1219    IFS=$as_save_IFS 
    1220    test -z "$as_dir" && as_dir=. 
    1221      for ac_exec_ext in '' $ac_executable_extensions; do 
    1222 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1223 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1224      ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" 
    1225      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1226      break 2 
    1227 @@ -6804,7 +6673,7 @@ do 
    1228    IFS=$as_save_IFS 
    1229    test -z "$as_dir" && as_dir=. 
    1230      for ac_exec_ext in '' $ac_executable_extensions; do 
    1231 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1232 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1233      ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" 
    1234      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1235      break 2 
    1236 @@ -6844,7 +6713,7 @@ do 
    1237    IFS=$as_save_IFS 
    1238    test -z "$as_dir" && as_dir=. 
    1239      for ac_exec_ext in '' $ac_executable_extensions; do 
    1240 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1241 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1242      ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" 
    1243      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1244      break 2 
    1245 @@ -6896,7 +6765,7 @@ do 
    1246    IFS=$as_save_IFS 
    1247    test -z "$as_dir" && as_dir=. 
    1248      for ac_exec_ext in '' $ac_executable_extensions; do 
    1249 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1250 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1251      ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" 
    1252      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1253      break 2 
    1254 @@ -6936,7 +6805,7 @@ do 
    1255    IFS=$as_save_IFS 
    1256    test -z "$as_dir" && as_dir=. 
    1257      for ac_exec_ext in '' $ac_executable_extensions; do 
    1258 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1259 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1260      ac_cv_prog_ac_ct_NMEDIT="nmedit" 
    1261      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1262      break 2 
    1263 @@ -6988,7 +6857,7 @@ do 
    1264    IFS=$as_save_IFS 
    1265    test -z "$as_dir" && as_dir=. 
    1266      for ac_exec_ext in '' $ac_executable_extensions; do 
    1267 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1268 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1269      ac_cv_prog_LIPO="${ac_tool_prefix}lipo" 
    1270      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1271      break 2 
    1272 @@ -7028,7 +6897,7 @@ do 
    1273    IFS=$as_save_IFS 
    1274    test -z "$as_dir" && as_dir=. 
    1275      for ac_exec_ext in '' $ac_executable_extensions; do 
    1276 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1277 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1278      ac_cv_prog_ac_ct_LIPO="lipo" 
    1279      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1280      break 2 
    1281 @@ -7080,7 +6949,7 @@ do 
    1282    IFS=$as_save_IFS 
    1283    test -z "$as_dir" && as_dir=. 
    1284      for ac_exec_ext in '' $ac_executable_extensions; do 
    1285 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1286 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1287      ac_cv_prog_OTOOL="${ac_tool_prefix}otool" 
    1288      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1289      break 2 
    1290 @@ -7120,7 +6989,7 @@ do 
    1291    IFS=$as_save_IFS 
    1292    test -z "$as_dir" && as_dir=. 
    1293      for ac_exec_ext in '' $ac_executable_extensions; do 
    1294 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1295 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1296      ac_cv_prog_ac_ct_OTOOL="otool" 
    1297      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1298      break 2 
    1299 @@ -7172,7 +7041,7 @@ do 
    1300    IFS=$as_save_IFS 
    1301    test -z "$as_dir" && as_dir=. 
    1302      for ac_exec_ext in '' $ac_executable_extensions; do 
    1303 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1304 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1305      ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" 
    1306      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1307      break 2 
    1308 @@ -7212,7 +7081,7 @@ do 
    1309    IFS=$as_save_IFS 
    1310    test -z "$as_dir" && as_dir=. 
    1311      for ac_exec_ext in '' $ac_executable_extensions; do 
    1312 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1313 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1314      ac_cv_prog_ac_ct_OTOOL64="otool64" 
    1315      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1316      break 2 
    1317 @@ -7291,13 +7160,7 @@ else 
    1318         $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ 
    1319           -dynamiclib -Wl,-single_module conftest.c 2>conftest.err 
    1320          _lt_result=$? 
    1321 -       # If there is a non-empty error log, and "single_module" 
    1322 -       # appears in it, assume the flag caused a linker warning 
    1323 -        if test -s conftest.err && $GREP single_module conftest.err; then 
    1324 -         cat conftest.err >&5 
    1325 -       # Otherwise, if the output was created with a 0 exit code from 
    1326 -       # the compiler, it worked. 
    1327 -       elif test -f libconftest.dylib && test $_lt_result -eq 0; then 
    1328 +       if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then 
    1329           lt_cv_apple_cc_single_mod=yes 
    1330         else 
    1331           cat conftest.err >&5 
    1332 @@ -7308,7 +7171,6 @@ else 
    1333  fi 
    1334  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 
    1335  $as_echo "$lt_cv_apple_cc_single_mod" >&6; } 
    1336 - 
    1337      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 
    1338  $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } 
    1339  if ${lt_cv_ld_exported_symbols_list+:} false; then : 
    1340 @@ -7341,7 +7203,6 @@ rm -f core conftest.err conftest.$ac_obj 
    1341  fi 
    1342  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 
    1343  $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } 
    1344 - 
    1345      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 
    1346  $as_echo_n "checking for -force_load linker flag... " >&6; } 
    1347  if ${lt_cv_ld_force_load+:} false; then : 
    1348 @@ -7363,9 +7224,7 @@ _LT_EOF 
    1349        echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 
    1350        $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err 
    1351        _lt_result=$? 
    1352 -      if test -s conftest.err && $GREP force_load conftest.err; then 
    1353 -       cat conftest.err >&5 
    1354 -      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then 
    1355 +      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then 
    1356         lt_cv_ld_force_load=yes 
    1357        else 
    1358         cat conftest.err >&5 
    1359 @@ -7740,22 +7599,7 @@ fi 
    1360   
    1361  # Check whether --with-pic was given. 
    1362  if test "${with_pic+set}" = set; then : 
    1363 -  withval=$with_pic; lt_p=${PACKAGE-default} 
    1364 -    case $withval in 
    1365 -    yes|no) pic_mode=$withval ;; 
    1366 -    *) 
    1367 -      pic_mode=default 
    1368 -      # Look at the argument we got.  We use all the common list separators. 
    1369 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," 
    1370 -      for lt_pkg in $withval; do 
    1371 -       IFS="$lt_save_ifs" 
    1372 -       if test "X$lt_pkg" = "X$lt_p"; then 
    1373 -         pic_mode=yes 
    1374 -       fi 
    1375 -      done 
    1376 -      IFS="$lt_save_ifs" 
    1377 -      ;; 
    1378 -    esac 
    1379 +  withval=$with_pic; pic_mode="$withval" 
    1380  else 
    1381    pic_mode=default 
    1382  fi 
    1383 @@ -7833,10 +7677,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo 
    1384   
    1385   
    1386   
    1387 - 
    1388 - 
    1389 - 
    1390 - 
    1391  test -z "$LN_S" && LN_S="ln -s" 
    1392   
    1393   
    1394 @@ -8126,10 +7966,6 @@ _lt_linker_boilerplate=`cat conftest.err 
    1395  $RM -r conftest* 
    1396   
    1397   
    1398 -## CAVEAT EMPTOR: 
    1399 -## There is no encapsulation within the following macros, do not change 
    1400 -## the running order or otherwise move them around unless you know exactly 
    1401 -## what you are doing... 
    1402  if test -n "$compiler"; then 
    1403   
    1404  lt_prog_compiler_no_builtin_flag= 
    1405 @@ -8296,9 +8132,7 @@ lt_prog_compiler_static= 
    1406      case $cc_basename in 
    1407      nvcc*) # Cuda Compiler Driver 2.2 
    1408        lt_prog_compiler_wl='-Xlinker ' 
    1409 -      if test -n "$lt_prog_compiler_pic"; then 
    1410 -        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" 
    1411 -      fi 
    1412 +      lt_prog_compiler_pic='-Xcompiler -fPIC' 
    1413        ;; 
    1414      esac 
    1415    else 
    1416 @@ -8389,33 +8223,18 @@ lt_prog_compiler_static= 
    1417         ;; 
    1418        *) 
    1419         case `$CC -V 2>&1 | sed 5q` in 
    1420 -       *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) 
    1421 +       *Sun\ F* | *Sun*Fortran*) 
    1422           # Sun Fortran 8.3 passes all unrecognized flags to the linker 
    1423           lt_prog_compiler_pic='-KPIC' 
    1424           lt_prog_compiler_static='-Bstatic' 
    1425           lt_prog_compiler_wl='' 
    1426           ;; 
    1427 -       *Sun\ F* | *Sun*Fortran*) 
    1428 -         lt_prog_compiler_pic='-KPIC' 
    1429 -         lt_prog_compiler_static='-Bstatic' 
    1430 -         lt_prog_compiler_wl='-Qoption ld ' 
    1431 -         ;; 
    1432         *Sun\ C*) 
    1433           # Sun C 5.9 
    1434           lt_prog_compiler_pic='-KPIC' 
    1435           lt_prog_compiler_static='-Bstatic' 
    1436           lt_prog_compiler_wl='-Wl,' 
    1437           ;; 
    1438 -        *Intel*\ [CF]*Compiler*) 
    1439 -         lt_prog_compiler_wl='-Wl,' 
    1440 -         lt_prog_compiler_pic='-fPIC' 
    1441 -         lt_prog_compiler_static='-static' 
    1442 -         ;; 
    1443 -       *Portland\ Group*) 
    1444 -         lt_prog_compiler_wl='-Wl,' 
    1445 -         lt_prog_compiler_pic='-fpic' 
    1446 -         lt_prog_compiler_static='-Bstatic' 
    1447 -         ;; 
    1448         esac 
    1449         ;; 
    1450        esac 
    1451 @@ -8777,6 +8596,7 @@ $as_echo_n "checking whether the $compil 
    1452    hardcode_direct=no 
    1453    hardcode_direct_absolute=no 
    1454    hardcode_libdir_flag_spec= 
    1455 +  hardcode_libdir_flag_spec_ld= 
    1456    hardcode_libdir_separator= 
    1457    hardcode_minus_L=no 
    1458    hardcode_shlibpath_var=unsupported 
    1459 @@ -9026,7 +8846,8 @@ _LT_EOF 
    1460         xlf* | bgf* | bgxlf* | mpixlf*) 
    1461           # IBM XL Fortran 10.1 on PPC cannot create shared libs itself 
    1462           whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' 
    1463 -         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' 
    1464 +         hardcode_libdir_flag_spec= 
    1465 +         hardcode_libdir_flag_spec_ld='-rpath $libdir' 
    1466           archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' 
    1467           if test "x$supports_anon_versioning" = xyes; then 
    1468             archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ 
    1469 @@ -9405,7 +9226,6 @@ fi 
    1470         # The linker will not automatically build a static lib if we build a DLL. 
    1471         # _LT_TAGVAR(old_archive_from_new_cmds, )='true' 
    1472         enable_shared_with_static_runtimes=yes 
    1473 -       exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' 
    1474         export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' 
    1475         # Don't use ranlib 
    1476         old_postinstall_cmds='chmod 644 $oldlib' 
    1477 @@ -9451,7 +9271,6 @@ fi 
    1478    hardcode_shlibpath_var=unsupported 
    1479    if test "$lt_cv_ld_force_load" = "yes"; then 
    1480      whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' 
    1481 - 
    1482    else 
    1483      whole_archive_flag_spec='' 
    1484    fi 
    1485 @@ -9480,6 +9299,10 @@ fi 
    1486        hardcode_shlibpath_var=no 
    1487        ;; 
    1488   
    1489 +    freebsd1*) 
    1490 +      ld_shlibs=no 
    1491 +      ;; 
    1492 + 
    1493      # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor 
    1494      # support.  Future versions do this automatically, but an explicit c++rt0.o 
    1495      # does not break anything, and helps significantly (at the cost of a little 
    1496 @@ -9492,7 +9315,7 @@ fi 
    1497        ;; 
    1498   
    1499      # Unfortunately, older versions of FreeBSD 2 do not have this feature. 
    1500 -    freebsd2.*) 
    1501 +    freebsd2*) 
    1502        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' 
    1503        hardcode_direct=yes 
    1504        hardcode_minus_L=yes 
    1505 @@ -9531,6 +9354,7 @@ fi 
    1506        fi 
    1507        if test "$with_gnu_ld" = no; then 
    1508         hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' 
    1509 +       hardcode_libdir_flag_spec_ld='+b $libdir' 
    1510         hardcode_libdir_separator=: 
    1511         hardcode_direct=yes 
    1512         hardcode_direct_absolute=yes 
    1513 @@ -10154,6 +9978,11 @@ esac 
    1514   
    1515   
    1516   
    1517 + 
    1518 + 
    1519 + 
    1520 + 
    1521 + 
    1522    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 
    1523  $as_echo_n "checking dynamic linker characteristics... " >&6; } 
    1524   
    1525 @@ -10243,7 +10072,7 @@ need_version=unknown 
    1526   
    1527  case $host_os in 
    1528  aix3*) 
    1529 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1530 +  version_type=linux 
    1531    library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' 
    1532    shlibpath_var=LIBPATH 
    1533   
    1534 @@ -10252,7 +10081,7 @@ aix3*) 
    1535    ;; 
    1536   
    1537  aix[4-9]*) 
    1538 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1539 +  version_type=linux 
    1540    need_lib_prefix=no 
    1541    need_version=no 
    1542    hardcode_into_libs=yes 
    1543 @@ -10317,7 +10146,7 @@ beos*) 
    1544    ;; 
    1545   
    1546  bsdi[45]*) 
    1547 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1548 +  version_type=linux 
    1549    need_version=no 
    1550    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 
    1551    soname_spec='${libname}${release}${shared_ext}$major' 
    1552 @@ -10456,7 +10285,7 @@ darwin* | rhapsody*) 
    1553    ;; 
    1554   
    1555  dgux*) 
    1556 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1557 +  version_type=linux 
    1558    need_lib_prefix=no 
    1559    need_version=no 
    1560    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' 
    1561 @@ -10464,6 +10293,10 @@ dgux*) 
    1562    shlibpath_var=LD_LIBRARY_PATH 
    1563    ;; 
    1564   
    1565 +freebsd1*) 
    1566 +  dynamic_linker=no 
    1567 +  ;; 
    1568 + 
    1569  freebsd* | dragonfly*) 
    1570    # DragonFly does not have aout.  When/if they implement a new 
    1571    # versioning mechanism, adjust this. 
    1572 @@ -10471,7 +10304,7 @@ freebsd* | dragonfly*) 
    1573      objformat=`/usr/bin/objformat` 
    1574    else 
    1575      case $host_os in 
    1576 -    freebsd[23].*) objformat=aout ;; 
    1577 +    freebsd[123]*) objformat=aout ;; 
    1578      *) objformat=elf ;; 
    1579      esac 
    1580    fi 
    1581 @@ -10489,7 +10322,7 @@ freebsd* | dragonfly*) 
    1582    esac 
    1583    shlibpath_var=LD_LIBRARY_PATH 
    1584    case $host_os in 
    1585 -  freebsd2.*) 
    1586 +  freebsd2*) 
    1587      shlibpath_overrides_runpath=yes 
    1588      ;; 
    1589    freebsd3.[01]* | freebsdelf3.[01]*) 
    1590 @@ -10509,18 +10342,17 @@ freebsd* | dragonfly*) 
    1591    ;; 
    1592   
    1593  gnu*) 
    1594 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1595 +  version_type=linux 
    1596    need_lib_prefix=no 
    1597    need_version=no 
    1598    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' 
    1599    soname_spec='${libname}${release}${shared_ext}$major' 
    1600    shlibpath_var=LD_LIBRARY_PATH 
    1601 -  shlibpath_overrides_runpath=no 
    1602    hardcode_into_libs=yes 
    1603    ;; 
    1604   
    1605  haiku*) 
    1606 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1607 +  version_type=linux 
    1608    need_lib_prefix=no 
    1609    need_version=no 
    1610    dynamic_linker="$host_os runtime_loader" 
    1611 @@ -10581,7 +10413,7 @@ hpux9* | hpux10* | hpux11*) 
    1612    ;; 
    1613   
    1614  interix[3-9]*) 
    1615 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1616 +  version_type=linux 
    1617    need_lib_prefix=no 
    1618    need_version=no 
    1619    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 
    1620 @@ -10597,7 +10429,7 @@ irix5* | irix6* | nonstopux*) 
    1621      nonstopux*) version_type=nonstopux ;; 
    1622      *) 
    1623         if test "$lt_cv_prog_gnu_ld" = yes; then 
    1624 -               version_type=linux # correct to gnu/linux during the next big refactor 
    1625 +               version_type=linux 
    1626         else 
    1627                 version_type=irix 
    1628         fi ;; 
    1629 @@ -10634,9 +10466,9 @@ linux*oldld* | linux*aout* | linux*coff* 
    1630    dynamic_linker=no 
    1631    ;; 
    1632   
    1633 -# This must be glibc/ELF. 
    1634 +# This must be Linux ELF. 
    1635  linux* | k*bsd*-gnu | kopensolaris*-gnu) 
    1636 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1637 +  version_type=linux 
    1638    need_lib_prefix=no 
    1639    need_version=no 
    1640    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 
    1641 @@ -10718,7 +10550,7 @@ netbsd*) 
    1642    ;; 
    1643   
    1644  newsos6) 
    1645 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1646 +  version_type=linux 
    1647    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 
    1648    shlibpath_var=LD_LIBRARY_PATH 
    1649    shlibpath_overrides_runpath=yes 
    1650 @@ -10787,7 +10619,7 @@ rdos*) 
    1651    ;; 
    1652   
    1653  solaris*) 
    1654 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1655 +  version_type=linux 
    1656    need_lib_prefix=no 
    1657    need_version=no 
    1658    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 
    1659 @@ -10812,7 +10644,7 @@ sunos4*) 
    1660    ;; 
    1661   
    1662  sysv4 | sysv4.3*) 
    1663 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1664 +  version_type=linux 
    1665    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 
    1666    soname_spec='${libname}${release}${shared_ext}$major' 
    1667    shlibpath_var=LD_LIBRARY_PATH 
    1668 @@ -10836,7 +10668,7 @@ sysv4 | sysv4.3*) 
    1669   
    1670  sysv4*MP*) 
    1671    if test -d /usr/nec ;then 
    1672 -    version_type=linux # correct to gnu/linux during the next big refactor 
    1673 +    version_type=linux 
    1674      library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' 
    1675      soname_spec='$libname${shared_ext}.$major' 
    1676      shlibpath_var=LD_LIBRARY_PATH 
    1677 @@ -10867,7 +10699,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* 
    1678   
    1679  tpf*) 
    1680    # TPF is a cross-target only.  Preferred cross-host = GNU/Linux. 
    1681 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1682 +  version_type=linux 
    1683    need_lib_prefix=no 
    1684    need_version=no 
    1685    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 
    1686 @@ -10877,7 +10709,7 @@ tpf*) 
    1687    ;; 
    1688   
    1689  uts4*) 
    1690 -  version_type=linux # correct to gnu/linux during the next big refactor 
    1691 +  version_type=linux 
    1692    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 
    1693    soname_spec='${libname}${release}${shared_ext}$major' 
    1694    shlibpath_var=LD_LIBRARY_PATH 
    1695 @@ -11659,8 +11491,6 @@ CC="$lt_save_CC" 
    1696   
    1697   
    1698   
    1699 - 
    1700 - 
    1701          ac_config_commands="$ac_config_commands libtool" 
    1702   
    1703   
    1704 @@ -11726,7 +11556,7 @@ do 
    1705    IFS=$as_save_IFS 
    1706    test -z "$as_dir" && as_dir=. 
    1707      for ac_exec_ext in '' $ac_executable_extensions; do 
    1708 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1709 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1710      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 
    1711      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1712      break 2 
    1713 @@ -11769,7 +11599,7 @@ do 
    1714    IFS=$as_save_IFS 
    1715    test -z "$as_dir" && as_dir=. 
    1716      for ac_exec_ext in '' $ac_executable_extensions; do 
    1717 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 
    1718 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    1719      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 
    1720      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    1721      break 2 
    1722 @@ -11932,7 +11762,7 @@ regular_CFLAGS="-Wall -Waggregate-return 
    1723  if test -n "$kbuilddir"; then 
    1724         { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5 
    1725  $as_echo_n "checking kernel version that we will build against... " >&6; } 
    1726 -       krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)"; 
    1727 +       krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)"; 
    1728         kmajor="${krel%%[^0-9]*}"; 
    1729         kmajor="$(($kmajor+0))"; 
    1730         krel="${krel:${#kmajor}}"; 
    1731 @@ -12076,14 +11906,6 @@ LIBOBJS=$ac_libobjs 
    1732  LTLIBOBJS=$ac_ltlibobjs 
    1733   
    1734   
    1735 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 
    1736 -$as_echo_n "checking that generated files are newer than configure... " >&6; } 
    1737 -   if test -n "$am_sleep_pid"; then 
    1738 -     # Hide warnings about reused PIDs. 
    1739 -     wait $am_sleep_pid 2>/dev/null 
    1740 -   fi 
    1741 -   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 
    1742 -$as_echo "done" >&6; } 
    1743   if test -n "$EXEEXT"; then 
    1744    am__EXEEXT_TRUE= 
    1745    am__EXEEXT_FALSE='#' 
    1746 @@ -12398,16 +12220,16 @@ if (echo >conf$$.file) 2>/dev/null; then 
    1747      # ... but there are two gotchas: 
    1748      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. 
    1749      # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. 
    1750 -    # In both cases, we have to default to `cp -pR'. 
    1751 +    # In both cases, we have to default to `cp -p'. 
    1752      ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || 
    1753 -      as_ln_s='cp -pR' 
    1754 +      as_ln_s='cp -p' 
    1755    elif ln conf$$.file conf$$ 2>/dev/null; then 
    1756      as_ln_s=ln 
    1757    else 
    1758 -    as_ln_s='cp -pR' 
    1759 +    as_ln_s='cp -p' 
    1760    fi 
    1761  else 
    1762 -  as_ln_s='cp -pR' 
    1763 +  as_ln_s='cp -p' 
    1764  fi 
    1765  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file 
    1766  rmdir conf$$.dir 2>/dev/null 
    1767 @@ -12467,16 +12289,28 @@ else 
    1768    as_mkdir_p=false 
    1769  fi 
    1770   
    1771 - 
    1772 -# as_fn_executable_p FILE 
    1773 -# ----------------------- 
    1774 -# Test if FILE is an executable regular file. 
    1775 -as_fn_executable_p () 
    1776 -{ 
    1777 -  test -f "$1" && test -x "$1" 
    1778 -} # as_fn_executable_p 
    1779 -as_test_x='test -x' 
    1780 -as_executable_p=as_fn_executable_p 
    1781 +if test -x / >/dev/null 2>&1; then 
    1782 +  as_test_x='test -x' 
    1783 +else 
    1784 +  if ls -dL / >/dev/null 2>&1; then 
    1785 +    as_ls_L_option=L 
    1786 +  else 
    1787 +    as_ls_L_option= 
    1788 +  fi 
    1789 +  as_test_x=' 
    1790 +    eval sh -c '\'' 
    1791 +      if test -d "$1"; then 
    1792 +       test -d "$1/."; 
    1793 +      else 
    1794 +       case $1 in #( 
    1795 +       -*)set "./$1";; 
    1796 +       esac; 
    1797 +       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( 
    1798 +       ???[sx]*):;;*)false;;esac;fi 
    1799 +    '\'' sh 
    1800 +  ' 
    1801 +fi 
    1802 +as_executable_p=$as_test_x 
    1803   
    1804  # Sed expression to map a string onto a valid CPP name. 
    1805  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" 
    1806 @@ -12498,7 +12332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri 
    1807  # values after options handling. 
    1808  ac_log=" 
    1809  This file was extended by xtables-addons $as_me 2.5, which was 
    1810 -generated by GNU Autoconf 2.69.  Invocation command line was 
    1811 +generated by GNU Autoconf 2.68.  Invocation command line was 
    1812   
    1813    CONFIG_FILES    = $CONFIG_FILES 
    1814    CONFIG_HEADERS  = $CONFIG_HEADERS 
    1815 @@ -12564,10 +12398,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ 
    1816  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 
    1817  ac_cs_version="\\ 
    1818  xtables-addons config.status 2.5 
    1819 -configured by $0, generated by GNU Autoconf 2.69, 
    1820 +configured by $0, generated by GNU Autoconf 2.68, 
    1821    with options \\"\$ac_cs_config\\" 
    1822   
    1823 -Copyright (C) 2012 Free Software Foundation, Inc. 
    1824 +Copyright (C) 2010 Free Software Foundation, Inc. 
    1825  This config.status script is free software; the Free Software Foundation 
    1826  gives unlimited permission to copy, distribute and modify it." 
    1827   
    1828 @@ -12658,7 +12492,7 @@ fi 
    1829  _ACEOF 
    1830  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 
    1831  if \$ac_cs_recheck; then 
    1832 -  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 
    1833 +  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 
    1834    shift 
    1835    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 
    1836    CONFIG_SHELL='$SHELL' 
    1837 @@ -12700,7 +12534,6 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$de 
    1838  enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' 
    1839  SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' 
    1840  ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' 
    1841 -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' 
    1842  host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' 
    1843  host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' 
    1844  host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' 
    1845 @@ -12783,6 +12616,7 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SE 
    1846  allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' 
    1847  no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' 
    1848  hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' 
    1849 +hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' 
    1850  hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' 
    1851  hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' 
    1852  hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' 
    1853 @@ -12838,7 +12672,6 @@ _LTECHO_EOF' 
    1854  # Quote evaled strings. 
    1855  for var in SHELL \ 
    1856  ECHO \ 
    1857 -PATH_SEPARATOR \ 
    1858  SED \ 
    1859  GREP \ 
    1860  EGREP \ 
    1861 @@ -12889,6 +12722,7 @@ with_gnu_ld \ 
    1862  allow_undefined_flag \ 
    1863  no_undefined_flag \ 
    1864  hardcode_libdir_flag_spec \ 
    1865 +hardcode_libdir_flag_spec_ld \ 
    1866  hardcode_libdir_separator \ 
    1867  exclude_expsyms \ 
    1868  include_expsyms \ 
    1869 @@ -13575,7 +13409,7 @@ $as_echo "$as_me: executing $ac_file com 
    1870   
    1871    case $ac_file$ac_mode in 
    1872      "depfiles":C) test x"$AMDEP_TRUE" != x"" || { 
    1873 -  # Older Autoconf quotes --file arguments for eval, but not when files 
    1874 +  # Autoconf 2.62 quotes --file arguments for eval, but not when files 
    1875    # are listed without --file.  Let's play safe and only enable the eval 
    1876    # if we detect the quoting. 
    1877    case $CONFIG_FILES in 
    1878 @@ -13588,7 +13422,7 @@ $as_echo "$as_me: executing $ac_file com 
    1879      # Strip MF so we end up with the name of the file. 
    1880      mf=`echo "$mf" | sed -e 's/:.*$//'` 
    1881      # Check whether this is an Automake generated Makefile or not. 
    1882 -    # We used to match only the files named 'Makefile.in', but 
    1883 +    # We used to match only the files named `Makefile.in', but 
    1884      # some people rename them; so instead we look at the file content. 
    1885      # Grep'ing the first line is not enough: some people post-process 
    1886      # each Makefile.in and add a new line on top of each file to say so. 
    1887 @@ -13622,19 +13456,21 @@ $as_echo X"$mf" | 
    1888        continue 
    1889      fi 
    1890      # Extract the definition of DEPDIR, am__include, and am__quote 
    1891 -    # from the Makefile without running 'make'. 
    1892 +    # from the Makefile without running `make'. 
    1893      DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 
    1894      test -z "$DEPDIR" && continue 
    1895      am__include=`sed -n 's/^am__include = //p' < "$mf"` 
    1896 -    test -z "$am__include" && continue 
    1897 +    test -z "am__include" && continue 
    1898      am__quote=`sed -n 's/^am__quote = //p' < "$mf"` 
    1899 +    # When using ansi2knr, U may be empty or an underscore; expand it 
    1900 +    U=`sed -n 's/^U = //p' < "$mf"` 
    1901      # Find all dependency output files, they are included files with 
    1902      # $(DEPDIR) in their names.  We invoke sed twice because it is the 
    1903      # simplest approach to changing $(DEPDIR) to its actual value in the 
    1904      # expansion. 
    1905      for file in `sed -n " 
    1906        s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 
    1907 -        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do 
    1908 +        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do 
    1909        # Make sure the directory exists. 
    1910        test -f "$dirpart/$file" && continue 
    1911        fdir=`$as_dirname -- "$file" || 
    1912 @@ -13688,8 +13524,8 @@ $as_echo X"$file" | 
    1913  # NOTE: Changes made to this file will be lost: look at ltmain.sh. 
    1914  # 
    1915  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 
    1916 -#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
    1917 -#                 Foundation, Inc. 
    1918 +#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 
    1919 +#                 Inc. 
    1920  #   Written by Gordon Matzigkeit, 1996 
    1921  # 
    1922  #   This file is part of GNU Libtool. 
    1923 @@ -13743,9 +13579,6 @@ SHELL=$lt_SHELL 
    1924  # An echo program that protects backslashes. 
    1925  ECHO=$lt_ECHO 
    1926   
    1927 -# The PATH separator for the build system. 
    1928 -PATH_SEPARATOR=$lt_PATH_SEPARATOR 
    1929 - 
    1930  # The host system. 
    1931  host_alias=$host_alias 
    1932  host=$host 
    1933 @@ -14047,6 +13880,10 @@ no_undefined_flag=$lt_no_undefined_flag 
    1934  # This must work even if \$libdir does not exist 
    1935  hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec 
    1936   
    1937 +# If ld is used when linking, flag to hardcode \$libdir into a binary 
    1938 +# during linking.  This must work even if \$libdir does not exist. 
    1939 +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld 
    1940 + 
    1941  # Whether we need a single "-rpath" flag with a separated argument. 
    1942  hardcode_libdir_separator=$lt_hardcode_libdir_separator 
    1943   
    19441--- a/configure.ac 
    19452+++ b/configure.ac 
Note: See TracChangeset for help on using the changeset viewer.