| diff -aruN sysfsutils-2.1.0/aclocal.m4 sysfsutils-2.1.0.N/aclocal.m4 | |
| --- sysfsutils-2.1.0/aclocal.m4 2006-08-23 01:38:32.000000000 -0700 | |
| +++ sysfsutils-2.1.0.N/aclocal.m4 2008-12-09 13:18:01.000000000 -0800 | |
| @@ -1,7 +1,7 @@ | |
| -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- | |
| +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- | |
| # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | |
| -# 2005 Free Software Foundation, Inc. | |
| +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -11,9 +11,17 @@ | |
| # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | |
| # PARTICULAR PURPOSE. | |
| +m4_ifndef([AC_AUTOCONF_VERSION], | |
| + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |
| +m4_if(AC_AUTOCONF_VERSION, [2.61],, | |
| +[m4_warning([this file was generated for autoconf 2.61. | |
| +You have another version of autoconf. It may work, but is not guaranteed to. | |
| +If you have problems, you may need to regenerate the build system entirely. | |
| +To do so, use the procedure documented by the package, typically `autoreconf'.])]) | |
| + | |
| # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- | |
| -# serial 48 AC_PROG_LIBTOOL | |
| +# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL | |
| # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) | |
| @@ -101,7 +109,6 @@ | |
| AC_REQUIRE([AC_OBJEXT])dnl | |
| AC_REQUIRE([AC_EXEEXT])dnl | |
| dnl | |
| - | |
| AC_LIBTOOL_SYS_MAX_CMD_LEN | |
| AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE | |
| AC_LIBTOOL_OBJDIR | |
| @@ -176,7 +183,7 @@ | |
| test -z "$ac_objext" && ac_objext=o | |
| # Determine commands to create old-style static archives. | |
| -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' | |
| +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' | |
| old_postinstall_cmds='chmod 644 $oldlib' | |
| old_postuninstall_cmds= | |
| @@ -203,6 +210,8 @@ | |
| ;; | |
| esac | |
| +_LT_REQUIRED_DARWIN_CHECKS | |
| + | |
| AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) | |
| AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], | |
| enable_win32_dll=yes, enable_win32_dll=no) | |
| @@ -263,8 +272,9 @@ | |
| # Check for compiler boilerplate output or warnings with | |
| # the simple compiler test code. | |
| AC_DEFUN([_LT_COMPILER_BOILERPLATE], | |
| -[ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +ac_outfile=conftest.$ac_objext | |
| +echo "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_compiler_boilerplate=`cat conftest.err` | |
| $rm conftest* | |
| @@ -276,13 +286,85 @@ | |
| # Check for linker boilerplate output or warnings with | |
| # the simple link test code. | |
| AC_DEFUN([_LT_LINKER_BOILERPLATE], | |
| -[ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_link_test_code" >conftest.$ac_ext | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +ac_outfile=conftest.$ac_objext | |
| +echo "$lt_simple_link_test_code" >conftest.$ac_ext | |
| eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_linker_boilerplate=`cat conftest.err` | |
| -$rm conftest* | |
| +$rm -r conftest* | |
| ])# _LT_LINKER_BOILERPLATE | |
| +# _LT_REQUIRED_DARWIN_CHECKS | |
| +# -------------------------- | |
| +# Check for some things on darwin | |
| +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ | |
| + case $host_os in | |
| + rhapsody* | darwin*) | |
| + AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) | |
| + AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) | |
| + | |
| + AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], | |
| + [lt_cv_apple_cc_single_mod=no | |
| + if test -z "${LT_MULTI_MODULE}"; then | |
| + # By default we will add the -single_module flag. You can override | |
| + # by either setting the environment variable LT_MULTI_MODULE | |
| + # non-empty at configure time, or by adding -multi_module to the | |
| + # link flags. | |
| + echo "int foo(void){return 1;}" > conftest.c | |
| + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | |
| + -dynamiclib ${wl}-single_module conftest.c | |
| + if test -f libconftest.dylib; then | |
| + lt_cv_apple_cc_single_mod=yes | |
| + rm -rf libconftest.dylib* | |
| + fi | |
| + rm conftest.c | |
| + fi]) | |
| + AC_CACHE_CHECK([for -exported_symbols_list linker flag], | |
| + [lt_cv_ld_exported_symbols_list], | |
| + [lt_cv_ld_exported_symbols_list=no | |
| + save_LDFLAGS=$LDFLAGS | |
| + echo "_main" > conftest.sym | |
| + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" | |
| + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], | |
| + [lt_cv_ld_exported_symbols_list=yes], | |
| + [lt_cv_ld_exported_symbols_list=no]) | |
| + LDFLAGS="$save_LDFLAGS" | |
| + ]) | |
| + case $host_os in | |
| + rhapsody* | darwin1.[[0123]]) | |
| + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | |
| + darwin1.*) | |
| + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | |
| + darwin*) | |
| + # if running on 10.5 or later, the deployment target defaults | |
| + # to the OS version, if on x86, and 10.4, the deployment | |
| + # target defaults to 10.4. Don't you love it? | |
| + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in | |
| + 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) | |
| + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | |
| + 10.[[012]]*) | |
| + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | |
| + 10.*) | |
| + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | |
| + esac | |
| + ;; | |
| + esac | |
| + if test "$lt_cv_apple_cc_single_mod" = "yes"; then | |
| + _lt_dar_single_mod='$single_module' | |
| + fi | |
| + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then | |
| + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' | |
| + else | |
| + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" | |
| + fi | |
| + if test "$DSYMUTIL" != ":"; then | |
| + _lt_dsymutil="~$DSYMUTIL \$lib || :" | |
| + else | |
| + _lt_dsymutil= | |
| + fi | |
| + ;; | |
| + esac | |
| +]) | |
| # _LT_AC_SYS_LIBPATH_AIX | |
| # ---------------------- | |
| @@ -293,12 +375,20 @@ | |
| # If we don't find anything, use the default library path according | |
| # to the aix ld manual. | |
| AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], | |
| -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi],[]) | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi],[]) | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| ])# _LT_AC_SYS_LIBPATH_AIX | |
| @@ -529,13 +619,17 @@ | |
| rm -rf conftest* | |
| ;; | |
| -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) | |
| +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | |
| +s390*-*linux*|sparc*-*linux*) | |
| # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if AC_TRY_EVAL(ac_compile); then | |
| case `/usr/bin/file conftest.o` in | |
| *32-bit*) | |
| case $host in | |
| + x86_64-*kfreebsd*-gnu) | |
| + LD="${LD-ld} -m elf_i386_fbsd" | |
| + ;; | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_i386" | |
| ;; | |
| @@ -552,6 +646,9 @@ | |
| ;; | |
| *64-bit*) | |
| case $host in | |
| + x86_64-*kfreebsd*-gnu) | |
| + LD="${LD-ld} -m elf_x86_64_fbsd" | |
| + ;; | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_x86_64" | |
| ;; | |
| @@ -592,7 +689,11 @@ | |
| *64-bit*) | |
| case $lt_cv_prog_gnu_ld in | |
| yes*) LD="${LD-ld} -m elf64_sparc" ;; | |
| - *) LD="${LD-ld} -64" ;; | |
| + *) | |
| + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | |
| + LD="${LD-ld} -64" | |
| + fi | |
| + ;; | |
| esac | |
| ;; | |
| esac | |
| @@ -623,7 +724,7 @@ | |
| AC_CACHE_CHECK([$1], [$2], | |
| [$2=no | |
| ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="$3" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| # (2) before a word containing "conftest.", or (3) at the end. | |
| @@ -664,11 +765,12 @@ | |
| # ------------------------------------------------------------ | |
| # Check whether the given compiler option works | |
| AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], | |
| -[AC_CACHE_CHECK([$1], [$2], | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +AC_CACHE_CHECK([$1], [$2], | |
| [$2=no | |
| save_LDFLAGS="$LDFLAGS" | |
| LDFLAGS="$LDFLAGS $3" | |
| - printf "$lt_simple_link_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_link_test_code" > conftest.$ac_ext | |
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | |
| # The linker can only warn and ignore the option if not recognized | |
| # So say no if there are warnings | |
| @@ -684,7 +786,7 @@ | |
| $2=yes | |
| fi | |
| fi | |
| - $rm conftest* | |
| + $rm -r conftest* | |
| LDFLAGS="$save_LDFLAGS" | |
| ]) | |
| @@ -782,24 +884,27 @@ | |
| fi | |
| ;; | |
| *) | |
| - # If test is not a shell built-in, we'll probably end up computing a | |
| - # maximum length that is only half of the actual maximum length, but | |
| - # we can't tell. | |
| - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} | |
| - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ | |
| + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` | |
| + if test -n "$lt_cv_sys_max_cmd_len"; then | |
| + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` | |
| + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` | |
| + else | |
| + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} | |
| + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ | |
| = "XX$teststring") >/dev/null 2>&1 && | |
| - new_result=`expr "X$teststring" : ".*" 2>&1` && | |
| - lt_cv_sys_max_cmd_len=$new_result && | |
| - test $i != 17 # 1/2 MB should be enough | |
| - do | |
| - i=`expr $i + 1` | |
| - teststring=$teststring$teststring | |
| - done | |
| - teststring= | |
| - # Add a significant safety factor because C++ compilers can tack on massive | |
| - # amounts of additional arguments before passing them to the linker. | |
| - # It appears as though 1/2 is a usable value. | |
| - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` | |
| + new_result=`expr "X$teststring" : ".*" 2>&1` && | |
| + lt_cv_sys_max_cmd_len=$new_result && | |
| + test $i != 17 # 1/2 MB should be enough | |
| + do | |
| + i=`expr $i + 1` | |
| + teststring=$teststring$teststring | |
| + done | |
| + teststring= | |
| + # Add a significant safety factor because C++ compilers can tack on massive | |
| + # amounts of additional arguments before passing them to the linker. | |
| + # It appears as though 1/2 is a usable value. | |
| + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` | |
| + fi | |
| ;; | |
| esac | |
| ]) | |
| @@ -952,7 +1057,7 @@ | |
| AC_CHECK_FUNC([shl_load], | |
| [lt_cv_dlopen="shl_load"], | |
| [AC_CHECK_LIB([dld], [shl_load], | |
| - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], | |
| + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], | |
| [AC_CHECK_FUNC([dlopen], | |
| [lt_cv_dlopen="dlopen"], | |
| [AC_CHECK_LIB([dl], [dlopen], | |
| @@ -960,7 +1065,7 @@ | |
| [AC_CHECK_LIB([svld], [dlopen], | |
| [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], | |
| [AC_CHECK_LIB([dld], [dld_link], | |
| - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) | |
| + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) | |
| ]) | |
| ]) | |
| ]) | |
| @@ -1026,7 +1131,8 @@ | |
| # --------------------------------- | |
| # Check to see if options -c and -o are simultaneously supported by compiler | |
| AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], | |
| -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl | |
| AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], | |
| [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], | |
| [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no | |
| @@ -1034,7 +1140,7 @@ | |
| mkdir conftest | |
| cd conftest | |
| mkdir out | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="-o out/conftest2.$ac_objext" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| @@ -1174,6 +1280,7 @@ | |
| darwin*) | |
| if test -n "$STRIP" ; then | |
| striplib="$STRIP -x" | |
| + old_striplib="$STRIP -S" | |
| AC_MSG_RESULT([yes]) | |
| else | |
| AC_MSG_RESULT([no]) | |
| @@ -1191,7 +1298,8 @@ | |
| # ----------------------------- | |
| # PORTME Fill in your ld.so characteristics | |
| AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], | |
| -[AC_MSG_CHECKING([dynamic linker characteristics]) | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +AC_MSG_CHECKING([dynamic linker characteristics]) | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| @@ -1205,20 +1313,58 @@ | |
| version_type=none | |
| dynamic_linker="$host_os ld.so" | |
| sys_lib_dlsearch_path_spec="/lib /usr/lib" | |
| +m4_if($1,[],[ | |
| if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | |
| + case $host_os in | |
| + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | |
| + *) lt_awk_arg="/^libraries:/" ;; | |
| + esac | |
| + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then | |
| # if the path contains ";" then we assume it to be the separator | |
| # otherwise default to the standard path separator (i.e. ":") - it is | |
| # assumed that no part of a normal pathname contains ";" but that should | |
| # okay in the real world where ";" in dirpaths is itself problematic. | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | |
| + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` | |
| else | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| fi | |
| + # Ok, now we have the path, separated by spaces, we can step through it | |
| + # and add multilib dir if necessary. | |
| + lt_tmp_lt_search_path_spec= | |
| + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` | |
| + for lt_sys_path in $lt_search_path_spec; do | |
| + if test -d "$lt_sys_path/$lt_multi_os_dir"; then | |
| + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" | |
| + else | |
| + test -d "$lt_sys_path" && \ | |
| + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | |
| + fi | |
| + done | |
| + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' | |
| +BEGIN {RS=" "; FS="/|\n";} { | |
| + lt_foo=""; | |
| + lt_count=0; | |
| + for (lt_i = NF; lt_i > 0; lt_i--) { | |
| + if ($lt_i != "" && $lt_i != ".") { | |
| + if ($lt_i == "..") { | |
| + lt_count++; | |
| + } else { | |
| + if (lt_count == 0) { | |
| + lt_foo="/" $lt_i lt_foo; | |
| + } else { | |
| + lt_count--; | |
| + } | |
| + } | |
| + } | |
| + } | |
| + if (lt_foo != "") { lt_freq[[lt_foo]]++; } | |
| + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } | |
| +}'` | |
| + sys_lib_search_path_spec=`echo $lt_search_path_spec` | |
| else | |
| sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | |
| -fi | |
| +fi]) | |
| need_lib_prefix=unknown | |
| hardcode_into_libs=no | |
| @@ -1236,7 +1382,7 @@ | |
| soname_spec='${libname}${release}${shared_ext}$major' | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[[4-9]]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -1375,12 +1521,8 @@ | |
| shlibpath_overrides_runpath=yes | |
| shlibpath_var=DYLD_LIBRARY_PATH | |
| shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' | |
| - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. | |
| - if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| - else | |
| - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| - fi | |
| + m4_if([$1], [],[ | |
| + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) | |
| sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' | |
| ;; | |
| @@ -1397,18 +1539,6 @@ | |
| dynamic_linker=no | |
| ;; | |
| -kfreebsd*-gnu) | |
| - version_type=linux | |
| - need_lib_prefix=no | |
| - need_version=no | |
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| - soname_spec='${libname}${release}${shared_ext}$major' | |
| - shlibpath_var=LD_LIBRARY_PATH | |
| - shlibpath_overrides_runpath=no | |
| - hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| - ;; | |
| - | |
| freebsd* | dragonfly*) | |
| # DragonFly does not have aout. When/if they implement a new | |
| # versioning mechanism, adjust this. | |
| @@ -1446,7 +1576,7 @@ | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| ;; | |
| - freebsd*) # from 4.6 on | |
| + *) # from 4.6 on, and DragonFly | |
| shlibpath_overrides_runpath=yes | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -1509,7 +1639,7 @@ | |
| postinstall_cmds='chmod 555 $lib' | |
| ;; | |
| -interix3*) | |
| +interix[[3-9]]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -1564,7 +1694,7 @@ | |
| ;; | |
| # This must be Linux ELF. | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -1578,27 +1708,10 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # find out which ABI we are using | |
| - libsuff= | |
| - case "$host_cpu" in | |
| - x86_64*|s390x*|powerpc64*) | |
| - echo '[#]line __oline__ "configure"' > conftest.$ac_ext | |
| - if AC_TRY_EVAL(ac_compile); then | |
| - case `/usr/bin/file conftest.$ac_objext` in | |
| - *64-bit*) | |
| - libsuff=64 | |
| - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| - ;; | |
| - esac | |
| - fi | |
| - rm -rf conftest* | |
| - ;; | |
| - esac | |
| - | |
| # Append ld.so.conf contents to the search path | |
| if test -f /etc/ld.so.conf; then | |
| - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
| fi | |
| # We used to test for /lib/ld.so.1 and disable shared libraries on | |
| @@ -1610,7 +1723,7 @@ | |
| dynamic_linker='GNU/Linux ld.so' | |
| ;; | |
| -knetbsd*-gnu) | |
| +netbsdelf*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -1619,7 +1732,7 @@ | |
| shlibpath_var=LD_LIBRARY_PATH | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| + dynamic_linker='NetBSD ld.elf_so' | |
| ;; | |
| netbsd*) | |
| @@ -1703,6 +1816,10 @@ | |
| sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | |
| ;; | |
| +rdos*) | |
| + dynamic_linker=no | |
| + ;; | |
| + | |
| solaris*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| @@ -1798,6 +1915,13 @@ | |
| AC_MSG_RESULT([$dynamic_linker]) | |
| test "$dynamic_linker" = no && can_build_shared=no | |
| +AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], | |
| +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) | |
| +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], | |
| +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) | |
| +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" | |
| + | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| @@ -1808,7 +1932,8 @@ | |
| # _LT_AC_TAGCONFIG | |
| # ---------------- | |
| AC_DEFUN([_LT_AC_TAGCONFIG], | |
| -[AC_ARG_WITH([tags], | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +AC_ARG_WITH([tags], | |
| [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], | |
| [include additional configurations @<:@automatic@:>@])], | |
| [tagnames="$withval"]) | |
| @@ -2069,7 +2194,7 @@ | |
| # AC_PATH_TOOL_PREFIX | |
| # ------------------- | |
| -# find a file program which can recognise shared library | |
| +# find a file program which can recognize shared library | |
| AC_DEFUN([AC_PATH_TOOL_PREFIX], | |
| [AC_REQUIRE([AC_PROG_EGREP])dnl | |
| AC_MSG_CHECKING([for $1]) | |
| @@ -2132,7 +2257,7 @@ | |
| # AC_PATH_MAGIC | |
| # ------------- | |
| -# find a file program which can recognise a shared library | |
| +# find a file program which can recognize a shared library | |
| AC_DEFUN([AC_PATH_MAGIC], | |
| [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) | |
| if test -z "$lt_cv_path_MAGIC_CMD"; then | |
| @@ -2279,7 +2404,7 @@ | |
| # how to check for library dependencies | |
| # -- PORTME fill in with the dynamic library characteristics | |
| AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], | |
| -[AC_CACHE_CHECK([how to recognise dependent libraries], | |
| +[AC_CACHE_CHECK([how to recognize dependent libraries], | |
| lt_cv_deplibs_check_method, | |
| [lt_cv_file_magic_cmd='$MAGIC_CMD' | |
| lt_cv_file_magic_test_file= | |
| @@ -2296,7 +2421,7 @@ | |
| # whether `pass_all' will *always* work, you probably want this one. | |
| case $host_os in | |
| -aix4* | aix5*) | |
| +aix[[4-9]]*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -2318,16 +2443,22 @@ | |
| mingw* | pw32*) | |
| # Base MSYS/MinGW do not provide the 'file' command needed by | |
| - # func_win32_libid shell function, so use a weaker test based on 'objdump'. | |
| - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| - lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| + # func_win32_libid shell function, so use a weaker test based on 'objdump', | |
| + # unless we find 'file', for example because we are cross-compiling. | |
| + if ( file / ) >/dev/null 2>&1; then | |
| + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | |
| + lt_cv_file_magic_cmd='func_win32_libid' | |
| + else | |
| + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| + lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| + fi | |
| ;; | |
| darwin* | rhapsody*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -freebsd* | kfreebsd*-gnu | dragonfly*) | |
| +freebsd* | dragonfly*) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
| case $host_cpu in | |
| i*86 ) | |
| @@ -2365,7 +2496,7 @@ | |
| esac | |
| ;; | |
| -interix3*) | |
| +interix[[3-9]]*) | |
| # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here | |
| lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' | |
| ;; | |
| @@ -2381,11 +2512,11 @@ | |
| ;; | |
| # This must be Linux ELF. | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -netbsd*) | |
| +netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
| lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' | |
| else | |
| @@ -2415,6 +2546,10 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| +rdos*) | |
| + lt_cv_deplibs_check_method=pass_all | |
| + ;; | |
| + | |
| solaris*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -2467,7 +2602,7 @@ | |
| lt_cv_path_NM="$NM" | |
| else | |
| lt_nm_to_check="${ac_tool_prefix}nm" | |
| - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then | |
| + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then | |
| lt_nm_to_check="$lt_nm_to_check nm" | |
| fi | |
| for lt_tmp_nm in $lt_nm_to_check; do | |
| @@ -2683,10 +2818,10 @@ | |
| _LT_AC_TAGVAR(objext, $1)=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code="int some_variable = 0;\n" | |
| +lt_simple_compile_test_code="int some_variable = 0;" | |
| # Code to be used in simple link tests | |
| -lt_simple_link_test_code='int main(){return(0);}\n' | |
| +lt_simple_link_test_code='int main(){return(0);}' | |
| _LT_AC_SYS_COMPILER | |
| @@ -2722,7 +2857,7 @@ | |
| fi | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[[4-9]]*) | |
| if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| test "$enable_shared" = yes && enable_static=no | |
| fi | |
| @@ -2779,6 +2914,7 @@ | |
| _LT_AC_TAGVAR(predeps, $1)= | |
| _LT_AC_TAGVAR(postdeps, $1)= | |
| _LT_AC_TAGVAR(compiler_lib_search_path, $1)= | |
| +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= | |
| # Source file extension for C++ test sources. | |
| ac_ext=cpp | |
| @@ -2788,10 +2924,10 @@ | |
| _LT_AC_TAGVAR(objext, $1)=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code="int some_variable = 0;\n" | |
| +lt_simple_compile_test_code="int some_variable = 0;" | |
| # Code to be used in simple link tests | |
| -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' | |
| +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' | |
| # ltmain only uses $CC for tagged configurations so make sure $CC is set. | |
| _LT_AC_SYS_COMPILER | |
| @@ -2888,7 +3024,7 @@ | |
| # FIXME: insert proper C++ library support | |
| _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
| ;; | |
| - aix4* | aix5*) | |
| + aix[[4-9]]*) | |
| if test "$host_cpu" = ia64; then | |
| # On IA64, the linker does run time linking by default, so we don't | |
| # have to do anything special. | |
| @@ -2901,7 +3037,7 @@ | |
| # Test if we are trying to use run time linking or normal | |
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we | |
| # need to do runtime linking. | |
| - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) | |
| + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) | |
| for ld_flag in $LDFLAGS; do | |
| case $ld_flag in | |
| *-brtl*) | |
| @@ -2937,7 +3073,7 @@ | |
| strings "$collect2name" | grep resolve_lib_name >/dev/null | |
| then | |
| # We have reworked collect2 | |
| - _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
| + : | |
| else | |
| # We have old collect2 | |
| _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported | |
| @@ -3047,59 +3183,31 @@ | |
| fi | |
| ;; | |
| darwin* | rhapsody*) | |
| - case $host_os in | |
| - rhapsody* | darwin1.[[012]]) | |
| - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' | |
| - ;; | |
| - *) # Darwin 1.3 on | |
| - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | |
| - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' | |
| - else | |
| - case ${MACOSX_DEPLOYMENT_TARGET} in | |
| - 10.[[012]]) | |
| - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' | |
| - ;; | |
| - 10.*) | |
| - _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' | |
| - ;; | |
| - esac | |
| - fi | |
| - ;; | |
| - esac | |
| _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | |
| _LT_AC_TAGVAR(hardcode_direct, $1)=no | |
| _LT_AC_TAGVAR(hardcode_automatic, $1)=yes | |
| _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported | |
| _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' | |
| _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | |
| - | |
| - if test "$GXX" = yes ; then | |
| - lt_int_apple_cc_single_mod=no | |
| + _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" | |
| + if test "$GXX" = yes ; then | |
| output_verbose_link_cmd='echo' | |
| - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then | |
| - lt_int_apple_cc_single_mod=yes | |
| + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | |
| + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + if test "$lt_cv_apple_cc_single_mod" != "yes"; then | |
| + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" | |
| fi | |
| - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - else | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - fi | |
| - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - else | |
| - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - fi | |
| - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| else | |
| case $cc_basename in | |
| xlc*) | |
| output_verbose_link_cmd='echo' | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' | |
| _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| ;; | |
| *) | |
| @@ -3133,7 +3241,7 @@ | |
| freebsd-elf*) | |
| _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | |
| ;; | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | |
| # conventions | |
| _LT_AC_TAGVAR(ld_shlibs, $1)=yes | |
| @@ -3182,9 +3290,7 @@ | |
| _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: | |
| case $host_cpu in | |
| - hppa*64*|ia64*) | |
| - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' | |
| - ;; | |
| + hppa*64*|ia64*) ;; | |
| *) | |
| _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | |
| ;; | |
| @@ -3252,7 +3358,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - interix3*) | |
| + interix[[3-9]]*) | |
| _LT_AC_TAGVAR(hardcode_direct, $1)=no | |
| _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | |
| _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| @@ -3292,7 +3398,7 @@ | |
| _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' | |
| _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| KCC*) | |
| # Kuck and Associates, Inc. (KAI) C++ Compiler | |
| @@ -3344,7 +3450,7 @@ | |
| _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' | |
| _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | |
| ;; | |
| - pgCC*) | |
| + pgCC* | pgcpp*) | |
| # Portland Group C++ compiler | |
| _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | |
| _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' | |
| @@ -3372,6 +3478,29 @@ | |
| # dependencies. | |
| output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' | |
| ;; | |
| + *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C++ 5.9 | |
| + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' | |
| + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | |
| + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' | |
| + | |
| + # Not sure whether something based on | |
| + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | |
| + # would be better. | |
| + output_verbose_link_cmd='echo' | |
| + | |
| + # Archives containing C++ object files must be created using | |
| + # "CC -xar", where "CC" is the Sun C++ compiler. This is | |
| + # necessary to make sure instantiated templates are included | |
| + # in the archive. | |
| + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' | |
| + ;; | |
| + esac | |
| + ;; | |
| esac | |
| ;; | |
| lynxos*) | |
| @@ -3394,7 +3523,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | |
| wlarc= | |
| @@ -3410,16 +3539,20 @@ | |
| _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
| ;; | |
| openbsd*) | |
| - _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
| - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' | |
| - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' | |
| - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | |
| - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | |
| + if test -f /usr/libexec/ld.so; then | |
| + _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
| + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' | |
| + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' | |
| + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | |
| + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | |
| + fi | |
| + output_verbose_link_cmd='echo' | |
| + else | |
| + _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
| fi | |
| - output_verbose_link_cmd='echo' | |
| ;; | |
| osf3*) | |
| case $cc_basename in | |
| @@ -3581,15 +3714,10 @@ | |
| case $host_os in | |
| solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; | |
| *) | |
| - # The C++ compiler is used as linker so we must use $wl | |
| - # flag to pass the commands to the underlying system | |
| - # linker. We must also pass each convience library through | |
| - # to the system linker between allextract/defaultextract. | |
| - # The C++ compiler will combine linker options so we | |
| - # cannot just pass the convience library names through | |
| - # without $wl. | |
| + # The compiler driver will combine and reorder linker options, | |
| + # but understands `-z linker_flag'. | |
| # Supported since Solaris 2.6 (maybe 2.5.1?) | |
| - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' | |
| + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' | |
| ;; | |
| esac | |
| _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | |
| @@ -3636,6 +3764,12 @@ | |
| fi | |
| _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' | |
| + case $host_os in | |
| + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; | |
| + *) | |
| + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | |
| + ;; | |
| + esac | |
| fi | |
| ;; | |
| esac | |
| @@ -3751,7 +3885,8 @@ | |
| # compiler output when linking a shared library. | |
| # Parse the compiler output and extract the necessary | |
| # objects, libraries and library flags. | |
| -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ | |
| +AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| dnl we can't use the lt_simple_compile_test_code here, | |
| dnl because it contains code intended for an executable, | |
| dnl not a library. It's possible we should let each | |
| @@ -3876,10 +4011,15 @@ | |
| $rm -f confest.$objext | |
| +_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= | |
| +if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then | |
| + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` | |
| +fi | |
| + | |
| # PORTME: override above test on systems where it is broken | |
| ifelse([$1],[CXX], | |
| [case $host_os in | |
| -interix3*) | |
| +interix[[3-9]]*) | |
| # Interix 3.5 installs completely hosed .la files for C++, so rather than | |
| # hack all around it, let's just trust "g++" to DTRT. | |
| _LT_AC_TAGVAR(predep_objects,$1)= | |
| @@ -3887,19 +4027,51 @@ | |
| _LT_AC_TAGVAR(postdeps,$1)= | |
| ;; | |
| +linux*) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C++ 5.9 | |
| + # | |
| + # The more standards-conforming stlport4 library is | |
| + # incompatible with the Cstd library. Avoid specifying | |
| + # it if it's in CXXFLAGS. Ignore libCrun as | |
| + # -library=stlport4 depends on it. | |
| + case " $CXX $CXXFLAGS " in | |
| + *" -library=stlport4 "*) | |
| + solaris_use_stlport4=yes | |
| + ;; | |
| + esac | |
| + if test "$solaris_use_stlport4" != yes; then | |
| + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' | |
| + fi | |
| + ;; | |
| + esac | |
| + ;; | |
| + | |
| solaris*) | |
| case $cc_basename in | |
| CC*) | |
| + # The more standards-conforming stlport4 library is | |
| + # incompatible with the Cstd library. Avoid specifying | |
| + # it if it's in CXXFLAGS. Ignore libCrun as | |
| + # -library=stlport4 depends on it. | |
| + case " $CXX $CXXFLAGS " in | |
| + *" -library=stlport4 "*) | |
| + solaris_use_stlport4=yes | |
| + ;; | |
| + esac | |
| + | |
| # Adding this requires a known-good setup of shared libraries for | |
| # Sun compiler versions before 5.6, else PIC objects from an old | |
| # archive will be linked into the output, leading to subtle bugs. | |
| - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' | |
| + if test "$solaris_use_stlport4" != yes; then | |
| + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' | |
| + fi | |
| ;; | |
| esac | |
| ;; | |
| esac | |
| ]) | |
| - | |
| case " $_LT_AC_TAGVAR(postdeps, $1) " in | |
| *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; | |
| esac | |
| @@ -3942,10 +4114,17 @@ | |
| _LT_AC_TAGVAR(objext, $1)=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code=" subroutine t\n return\n end\n" | |
| +lt_simple_compile_test_code="\ | |
| + subroutine t | |
| + return | |
| + end | |
| +" | |
| # Code to be used in simple link tests | |
| -lt_simple_link_test_code=" program t\n end\n" | |
| +lt_simple_link_test_code="\ | |
| + program t | |
| + end | |
| +" | |
| # ltmain only uses $CC for tagged configurations so make sure $CC is set. | |
| _LT_AC_SYS_COMPILER | |
| @@ -3977,7 +4156,7 @@ | |
| postinstall_cmds='$RANLIB $lib' | |
| fi | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[[4-9]]*) | |
| if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| test "$enable_shared" = yes && enable_static=no | |
| fi | |
| @@ -4024,10 +4203,10 @@ | |
| _LT_AC_TAGVAR(objext, $1)=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code="class foo {}\n" | |
| +lt_simple_compile_test_code="class foo {}" | |
| # Code to be used in simple link tests | |
| -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' | |
| +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' | |
| # ltmain only uses $CC for tagged configurations so make sure $CC is set. | |
| _LT_AC_SYS_COMPILER | |
| @@ -4080,7 +4259,7 @@ | |
| _LT_AC_TAGVAR(objext, $1)=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' | |
| +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' | |
| # Code to be used in simple link tests | |
| lt_simple_link_test_code="$lt_simple_compile_test_code" | |
| @@ -4154,6 +4333,7 @@ | |
| _LT_AC_TAGVAR(predeps, $1) \ | |
| _LT_AC_TAGVAR(postdeps, $1) \ | |
| _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ | |
| + _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ | |
| _LT_AC_TAGVAR(archive_cmds, $1) \ | |
| _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ | |
| _LT_AC_TAGVAR(postinstall_cmds, $1) \ | |
| @@ -4169,6 +4349,7 @@ | |
| _LT_AC_TAGVAR(module_cmds, $1) \ | |
| _LT_AC_TAGVAR(module_expsym_cmds, $1) \ | |
| _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ | |
| + _LT_AC_TAGVAR(fix_srcfile_path, $1) \ | |
| _LT_AC_TAGVAR(exclude_expsyms, $1) \ | |
| _LT_AC_TAGVAR(include_expsyms, $1); do | |
| @@ -4215,7 +4396,7 @@ | |
| # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) | |
| # NOTE: Changes made to this file will be lost: look at ltmain.sh. | |
| # | |
| -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | |
| # Free Software Foundation, Inc. | |
| # | |
| # This file is part of GNU Libtool: | |
| @@ -4452,6 +4633,10 @@ | |
| # shared library. | |
| postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) | |
| +# The directories searched by this compiler when creating a shared | |
| +# library | |
| +compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) | |
| + | |
| # The library search path used internally by the compiler when linking | |
| # a shared library. | |
| compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | |
| @@ -4540,7 +4725,7 @@ | |
| sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Fix the shell variable \$srcfile for the compiler. | |
| -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| # Set to yes if exported symbols are required. | |
| always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) | |
| @@ -4623,6 +4808,7 @@ | |
| # --------------------------------- | |
| AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], | |
| [AC_REQUIRE([AC_CANONICAL_HOST]) | |
| +AC_REQUIRE([LT_AC_PROG_SED]) | |
| AC_REQUIRE([AC_PROG_NM]) | |
| AC_REQUIRE([AC_OBJEXT]) | |
| # Check for command to grab the raw symbol name followed by C symbol from nm. | |
| @@ -4659,7 +4845,7 @@ | |
| lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
| lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" | |
| ;; | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| if test "$host_cpu" = ia64; then | |
| symcode='[[ABCDGIRSTW]]' | |
| lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
| @@ -4800,7 +4986,7 @@ | |
| echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD | |
| cat conftest.$ac_ext >&5 | |
| fi | |
| - rm -f conftest* conftst* | |
| + rm -rf conftest* conftst* | |
| # Do not use the global_symbol_pipe unless it works. | |
| if test "$pipe_works" = yes; then | |
| @@ -4849,13 +5035,16 @@ | |
| # like `-m68040'. | |
| _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' | |
| ;; | |
| - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| # PIC is the default for these OSes. | |
| ;; | |
| - mingw* | os2* | pw32*) | |
| + mingw* | cygwin* | os2* | pw32*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' | |
| + # Although the cygwin gcc ignores -fPIC, still need this for old-style | |
| + # (--disable-auto-import) libraries | |
| + m4_if([$1], [GCJ], [], | |
| + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | |
| ;; | |
| darwin* | rhapsody*) | |
| # PIC is the default on this platform | |
| @@ -4866,7 +5055,7 @@ | |
| # DJGPP does not support shared libraries at all | |
| _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= | |
| ;; | |
| - interix3*) | |
| + interix[[3-9]]*) | |
| # Interix 3.x gcc -fpic/-fPIC options generate broken code. | |
| # Instead, we relocate shared libraries at runtime. | |
| ;; | |
| @@ -4892,7 +5081,7 @@ | |
| esac | |
| else | |
| case $host_os in | |
| - aix4* | aix5*) | |
| + aix[[4-9]]*) | |
| # All AIX code is PIC. | |
| if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| @@ -4932,7 +5121,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| # FreeBSD uses GNU C++ | |
| ;; | |
| hpux9* | hpux10* | hpux11*) | |
| @@ -4975,7 +5164,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| KCC*) | |
| # KAI C++ Compiler | |
| @@ -4988,7 +5177,7 @@ | |
| _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | |
| _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' | |
| ;; | |
| - pgCC*) | |
| + pgCC* | pgcpp*) | |
| # Portland Group C++ compiler. | |
| _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | |
| _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' | |
| @@ -5002,6 +5191,14 @@ | |
| _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | |
| ;; | |
| *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C++ 5.9 | |
| + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | |
| + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | |
| + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' | |
| + ;; | |
| + esac | |
| ;; | |
| esac | |
| ;; | |
| @@ -5018,7 +5215,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| ;; | |
| osf3* | osf4* | osf5*) | |
| case $cc_basename in | |
| @@ -5122,14 +5319,17 @@ | |
| _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' | |
| ;; | |
| - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| # PIC is the default for these OSes. | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' | |
| + # Although the cygwin gcc ignores -fPIC, still need this for old-style | |
| + # (--disable-auto-import) libraries | |
| + m4_if([$1], [GCJ], [], | |
| + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -5138,7 +5338,7 @@ | |
| _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' | |
| ;; | |
| - interix3*) | |
| + interix[[3-9]]*) | |
| # Interix 3.x gcc -fpic/-fPIC options generate broken code. | |
| # Instead, we relocate shared libraries at runtime. | |
| ;; | |
| @@ -5196,10 +5396,11 @@ | |
| esac | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' | |
| + m4_if([$1], [GCJ], [], | |
| + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) | |
| ;; | |
| hpux9* | hpux10* | hpux11*) | |
| @@ -5229,7 +5430,7 @@ | |
| _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| icc* | ecc*) | |
| _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | |
| @@ -5248,6 +5449,22 @@ | |
| # All Alpha code is PIC. | |
| _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | |
| ;; | |
| + *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C 5.9 | |
| + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | |
| + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | |
| + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | |
| + ;; | |
| + *Sun\ F*) | |
| + # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | |
| + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | |
| + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' | |
| + ;; | |
| + esac | |
| + ;; | |
| esac | |
| ;; | |
| @@ -5257,6 +5474,10 @@ | |
| _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | |
| ;; | |
| + rdos*) | |
| + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' | |
| + ;; | |
| + | |
| solaris*) | |
| _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | |
| _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' | |
| @@ -5316,7 +5537,7 @@ | |
| # | |
| if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then | |
| AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], | |
| - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), | |
| + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), | |
| [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], | |
| [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in | |
| "" | " "*) ;; | |
| @@ -5340,7 +5561,7 @@ | |
| # | |
| wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" | |
| AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], | |
| - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), | |
| + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), | |
| $lt_tmp_static_flag, | |
| [], | |
| [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) | |
| @@ -5351,11 +5572,12 @@ | |
| # ------------------------------------ | |
| # See if the linker supports building shared libraries. | |
| AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], | |
| -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | |
| +[AC_REQUIRE([LT_AC_PROG_SED])dnl | |
| +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) | |
| ifelse([$1],[CXX],[ | |
| _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
| case $host_os in | |
| - aix4* | aix5*) | |
| + aix[[4-9]]*) | |
| # If we're using GNU nm, then we don't want the "-C" option. | |
| # -C means demangle to AIX nm, but means don't demangle with GNU nm | |
| if $NM -V 2>&1 | grep 'GNU' > /dev/null; then | |
| @@ -5368,12 +5590,16 @@ | |
| _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | |
| ;; | |
| cygwin* | mingw*) | |
| - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' | |
| + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' | |
| + ;; | |
| + linux* | k*bsd*-gnu) | |
| + _LT_AC_TAGVAR(link_all_deplibs, $1)=no | |
| ;; | |
| *) | |
| _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
| ;; | |
| esac | |
| + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | |
| ],[ | |
| runpath_var= | |
| _LT_AC_TAGVAR(allow_undefined_flag, $1)= | |
| @@ -5404,12 +5630,14 @@ | |
| # it will be wrapped by ` (' and `)$', so one must not match beginning or | |
| # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', | |
| # as well as any symbol that contains `d'. | |
| - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" | |
| + _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] | |
| # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out | |
| # platforms (ab)use it in PIC code, but their linkers get confused if | |
| # the symbol is explicitly referenced. Since portable code cannot | |
| # rely on this symbol name, it's probably fine to never include it in | |
| # preloaded symbol tables. | |
| + # Exclude shared library initialization/finalization symbols. | |
| +dnl Note also adjust exclude_expsyms for C++ above. | |
| extract_expsyms_cmds= | |
| # Just being paranoid about ensuring that cc_basename is set. | |
| _LT_CC_BASENAME([$compiler]) | |
| @@ -5459,7 +5687,7 @@ | |
| # See if GNU ld supports shared libraries. | |
| case $host_os in | |
| - aix3* | aix4* | aix5*) | |
| + aix[[3-9]]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| if test "$host_cpu" != ia64; then | |
| _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
| @@ -5507,7 +5735,7 @@ | |
| _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported | |
| _LT_AC_TAGVAR(always_export_symbols, $1)=no | |
| _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | |
| - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' | |
| + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' | |
| if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then | |
| _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | |
| @@ -5525,7 +5753,7 @@ | |
| fi | |
| ;; | |
| - interix3*) | |
| + interix[[3-9]]*) | |
| _LT_AC_TAGVAR(hardcode_direct, $1)=no | |
| _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | |
| _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| @@ -5540,7 +5768,7 @@ | |
| _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | |
| ;; | |
| - linux*) | |
| + gnu* | linux* | k*bsd*-gnu) | |
| if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
| tmp_addflag= | |
| case $cc_basename,$host_cpu in | |
| @@ -5558,20 +5786,30 @@ | |
| ifc* | ifort*) # Intel Fortran compiler | |
| tmp_addflag=' -nofor_main' ;; | |
| esac | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) # Sun C 5.9 | |
| + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' | |
| + tmp_sharedflag='-G' ;; | |
| + *Sun\ F*) # Sun Fortran 8.3 | |
| + tmp_sharedflag='-G' ;; | |
| + *) | |
| + tmp_sharedflag='-shared' ;; | |
| + esac | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| if test $supports_anon_versioning = yes; then | |
| _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ | |
| cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | |
| $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
| - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| fi | |
| + _LT_AC_TAGVAR(link_all_deplibs, $1)=no | |
| else | |
| _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
| fi | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
| wlarc= | |
| @@ -5604,7 +5842,7 @@ | |
| sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) | |
| case `$LD -v 2>&1` in | |
| - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) | |
| + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) | |
| _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
| cat <<_LT_EOF 1>&2 | |
| @@ -5669,7 +5907,7 @@ | |
| fi | |
| ;; | |
| - aix4* | aix5*) | |
| + aix[[4-9]]*) | |
| if test "$host_cpu" = ia64; then | |
| # On IA64, the linker does run time linking by default, so we don't | |
| # have to do anything special. | |
| @@ -5689,7 +5927,7 @@ | |
| # Test if we are trying to use run time linking or normal | |
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we | |
| # need to do runtime linking. | |
| - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) | |
| + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) | |
| for ld_flag in $LDFLAGS; do | |
| if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | |
| aix_use_runtimelinking=yes | |
| @@ -5723,7 +5961,7 @@ | |
| strings "$collect2name" | grep resolve_lib_name >/dev/null | |
| then | |
| # We have reworked collect2 | |
| - _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
| + : | |
| else | |
| # We have old collect2 | |
| _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported | |
| @@ -5816,7 +6054,7 @@ | |
| # The linker will automatically build a .lib file if we build a DLL. | |
| _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' | |
| # FIXME: Should let the user specify the lib program. | |
| - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' | |
| + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' | |
| _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes | |
| ;; | |
| @@ -5849,19 +6087,18 @@ | |
| _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | |
| if test "$GCC" = yes ; then | |
| output_verbose_link_cmd='echo' | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | |
| + _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" | |
| else | |
| case $cc_basename in | |
| xlc*) | |
| output_verbose_link_cmd='echo' | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' | |
| _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| ;; | |
| *) | |
| @@ -5901,7 +6138,7 @@ | |
| ;; | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | |
| _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
| @@ -6003,7 +6240,7 @@ | |
| _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
| else | |
| @@ -6023,24 +6260,28 @@ | |
| ;; | |
| openbsd*) | |
| - _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
| - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | |
| - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | |
| + if test -f /usr/libexec/ld.so; then | |
| + _LT_AC_TAGVAR(hardcode_direct, $1)=yes | |
| + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | |
| + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' | |
| + else | |
| + case $host_os in | |
| + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | |
| + ;; | |
| + *) | |
| + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| + ;; | |
| + esac | |
| + fi | |
| else | |
| - case $host_os in | |
| - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' | |
| - ;; | |
| - *) | |
| - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' | |
| - ;; | |
| - esac | |
| + _LT_AC_TAGVAR(ld_shlibs, $1)=no | |
| fi | |
| ;; | |
| @@ -6099,17 +6340,16 @@ | |
| case $host_os in | |
| solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; | |
| *) | |
| - # The compiler driver will combine linker options so we | |
| - # cannot just pass the convience library names through | |
| - # without $wl, iff we do not link with $LD. | |
| - # Luckily, gcc supports the same syntax we need for Sun Studio. | |
| + # The compiler driver will combine and reorder linker options, | |
| + # but understands `-z linker_flag'. GCC discards it without `$wl', | |
| + # but is careful enough not to reorder. | |
| # Supported since Solaris 2.6 (maybe 2.5.1?) | |
| - case $wlarc in | |
| - '') | |
| - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; | |
| - *) | |
| - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; | |
| - esac ;; | |
| + if test "$GCC" = yes; then | |
| + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | |
| + else | |
| + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' | |
| + fi | |
| + ;; | |
| esac | |
| _LT_AC_TAGVAR(link_all_deplibs, $1)=yes | |
| ;; | |
| @@ -6166,7 +6406,7 @@ | |
| fi | |
| ;; | |
| - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) | |
| + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) | |
| _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' | |
| _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no | |
| _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no | |
| @@ -6241,7 +6481,7 @@ | |
| # to ld, don't add -lc before -lgcc. | |
| AC_MSG_CHECKING([whether -lc should be explicitly linked in]) | |
| $rm conftest* | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| if AC_TRY_EVAL(ac_compile) 2>conftest.err; then | |
| soname=conftest | |
| @@ -6344,6 +6584,30 @@ | |
| [AC_CHECK_TOOL(RC, windres, no) | |
| ]) | |
| + | |
| +# Cheap backport of AS_EXECUTABLE_P and required macros | |
| +# from Autoconf 2.59; we should not use $as_executable_p directly. | |
| + | |
| +# _AS_TEST_PREPARE | |
| +# ---------------- | |
| +m4_ifndef([_AS_TEST_PREPARE], | |
| +[m4_defun([_AS_TEST_PREPARE], | |
| +[if test -x / >/dev/null 2>&1; then | |
| + as_executable_p='test -x' | |
| +else | |
| + as_executable_p='test -f' | |
| +fi | |
| +])])# _AS_TEST_PREPARE | |
| + | |
| +# AS_EXECUTABLE_P | |
| +# --------------- | |
| +# Check whether a file is executable. | |
| +m4_ifndef([AS_EXECUTABLE_P], | |
| +[m4_defun([AS_EXECUTABLE_P], | |
| +[AS_REQUIRE([_AS_TEST_PREPARE])dnl | |
| +$as_executable_p $1[]dnl | |
| +])])# AS_EXECUTABLE_P | |
| + | |
| # NOTE: This macro has been submitted for inclusion into # | |
| # GNU Autoconf as AC_PROG_SED. When it is available in # | |
| # a released version of Autoconf we should remove this # | |
| @@ -6364,12 +6628,13 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for lt_ac_prog in sed gsed; do | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then | |
| + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then | |
| lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" | |
| fi | |
| done | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| lt_ac_max=0 | |
| lt_ac_count=0 | |
| # Add /usr/xpg4/bin/sed as it is typically found on Solaris | |
| @@ -6402,10 +6667,11 @@ | |
| done | |
| ]) | |
| SED=$lt_cv_path_SED | |
| +AC_SUBST([SED]) | |
| AC_MSG_RESULT([$SED]) | |
| ]) | |
| -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. | |
| +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| @@ -6415,14 +6681,31 @@ | |
| # ---------------------------- | |
| # Automake X.Y traces this macro to ensure aclocal.m4 has been | |
| # generated from the m4 files accompanying Automake X.Y. | |
| -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) | |
| +# (This private macro should not be called outside this file.) | |
| +AC_DEFUN([AM_AUTOMAKE_VERSION], | |
| +[am__api_version='1.10' | |
| +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | |
| +dnl require some minimum version. Point them to the right macro. | |
| +m4_if([$1], [1.10.1], [], | |
| + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | |
| +]) | |
| + | |
| +# _AM_AUTOCONF_VERSION(VERSION) | |
| +# ----------------------------- | |
| +# aclocal traces this macro to find the Autoconf version. | |
| +# This is a private macro too. Using m4_define simplifies | |
| +# the logic in aclocal, which can simply ignore this definition. | |
| +m4_define([_AM_AUTOCONF_VERSION], []) | |
| # AM_SET_CURRENT_AUTOMAKE_VERSION | |
| # ------------------------------- | |
| -# Call AM_AUTOMAKE_VERSION so it can be traced. | |
| +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | |
| # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. | |
| AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | |
| - [AM_AUTOMAKE_VERSION([1.9.6])]) | |
| +[AM_AUTOMAKE_VERSION([1.10.1])dnl | |
| +m4_ifndef([AC_AUTOCONF_VERSION], | |
| + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | |
| +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) | |
| # AM_AUX_DIR_EXPAND -*- Autoconf -*- | |
| @@ -6479,14 +6762,14 @@ | |
| # AM_CONDITIONAL -*- Autoconf -*- | |
| -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 | |
| +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 | |
| # Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 7 | |
| +# serial 8 | |
| # AM_CONDITIONAL(NAME, SHELL-CONDITION) | |
| # ------------------------------------- | |
| @@ -6495,8 +6778,10 @@ | |
| [AC_PREREQ(2.52)dnl | |
| ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], | |
| [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl | |
| -AC_SUBST([$1_TRUE]) | |
| -AC_SUBST([$1_FALSE]) | |
| +AC_SUBST([$1_TRUE])dnl | |
| +AC_SUBST([$1_FALSE])dnl | |
| +_AM_SUBST_NOTMAKE([$1_TRUE])dnl | |
| +_AM_SUBST_NOTMAKE([$1_FALSE])dnl | |
| if $2; then | |
| $1_TRUE= | |
| $1_FALSE='#' | |
| @@ -6510,15 +6795,14 @@ | |
| Usually this means the macro was only invoked conditionally.]]) | |
| fi])]) | |
| - | |
| -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 | |
| +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | |
| # Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 8 | |
| +# serial 9 | |
| # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be | |
| # written in clear, in which case automake, when reading aclocal.m4, | |
| @@ -6546,6 +6830,7 @@ | |
| ifelse([$1], CC, [depcc="$CC" am_compiler_list=], | |
| [$1], CXX, [depcc="$CXX" am_compiler_list=], | |
| [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], | |
| + [$1], UPC, [depcc="$UPC" am_compiler_list=], | |
| [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], | |
| [depcc="$$1" am_compiler_list=]) | |
| @@ -6611,6 +6896,7 @@ | |
| depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | |
| $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | |
| >/dev/null 2>conftest.err && | |
| + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | |
| ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | |
| @@ -6663,7 +6949,8 @@ | |
| AMDEPBACKSLASH='\' | |
| fi | |
| AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) | |
| -AC_SUBST([AMDEPBACKSLASH]) | |
| +AC_SUBST([AMDEPBACKSLASH])dnl | |
| +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl | |
| ]) | |
| # Generate code to set up dependency tracking. -*- Autoconf -*- | |
| @@ -6688,8 +6975,9 @@ | |
| # some people rename them; so instead we look at the file content. | |
| # Grep'ing the first line is not enough: some people post-process | |
| # each Makefile.in and add a new line on top of each file to say so. | |
| - # So let's grep whole file. | |
| - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then | |
| + # Grep'ing the whole file is not good either: AIX grep has a line | |
| + # limit of 2048, but all sed's we know have understand at least 4000. | |
| + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | |
| dirpart=`AS_DIRNAME("$mf")` | |
| else | |
| continue | |
| @@ -6734,28 +7022,16 @@ | |
| [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) | |
| ]) | |
| -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 | |
| -# Free Software Foundation, Inc. | |
| -# | |
| -# This file is free software; the Free Software Foundation | |
| -# gives unlimited permission to copy and/or distribute it, | |
| -# with or without modifications, as long as this notice is preserved. | |
| - | |
| -# serial 8 | |
| - | |
| -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. | |
| -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) | |
| - | |
| # Do all the work for Automake. -*- Autoconf -*- | |
| -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 | |
| -# Free Software Foundation, Inc. | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | |
| +# 2005, 2006, 2008 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 12 | |
| +# serial 13 | |
| # This macro actually does too much. Some checks are only needed if | |
| # your package does certain things. But this isn't really a big deal. | |
| @@ -6772,16 +7048,20 @@ | |
| # arguments mandatory, and then we can depend on a new Autoconf | |
| # release and drop the old call support. | |
| AC_DEFUN([AM_INIT_AUTOMAKE], | |
| -[AC_PREREQ([2.58])dnl | |
| +[AC_PREREQ([2.60])dnl | |
| dnl Autoconf wants to disallow AM_ names. We explicitly allow | |
| dnl the ones we care about. | |
| m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | |
| AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl | |
| AC_REQUIRE([AC_PROG_INSTALL])dnl | |
| -# test to see if srcdir already configured | |
| -if test "`cd $srcdir && pwd`" != "`pwd`" && | |
| - test -f $srcdir/config.status; then | |
| - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) | |
| +if test "`cd $srcdir && pwd`" != "`pwd`"; then | |
| + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output | |
| + # is not polluted with repeated "-I." | |
| + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl | |
| + # test to see if srcdir already configured | |
| + if test -f $srcdir/config.status; then | |
| + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) | |
| + fi | |
| fi | |
| # test whether we have cygpath | |
| @@ -6801,6 +7081,9 @@ | |
| AC_SUBST([PACKAGE], [$1])dnl | |
| AC_SUBST([VERSION], [$2])], | |
| [_AM_SET_OPTIONS([$1])dnl | |
| +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. | |
| +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, | |
| + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl | |
| AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl | |
| AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl | |
| @@ -6836,6 +7119,10 @@ | |
| [_AM_DEPENDENCIES(CXX)], | |
| [define([AC_PROG_CXX], | |
| defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl | |
| +AC_PROVIDE_IFELSE([AC_PROG_OBJC], | |
| + [_AM_DEPENDENCIES(OBJC)], | |
| + [define([AC_PROG_OBJC], | |
| + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl | |
| ]) | |
| ]) | |
| @@ -6849,16 +7136,17 @@ | |
| # our stamp files there. | |
| AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], | |
| [# Compute $1's index in $config_headers. | |
| +_am_arg=$1 | |
| _am_stamp_count=1 | |
| for _am_header in $config_headers :; do | |
| case $_am_header in | |
| - $1 | $1:* ) | |
| + $_am_arg | $_am_arg:* ) | |
| break ;; | |
| * ) | |
| _am_stamp_count=`expr $_am_stamp_count + 1` ;; | |
| esac | |
| done | |
| -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) | |
| +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | |
| # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. | |
| # | |
| @@ -6871,7 +7159,7 @@ | |
| # Define $install_sh. | |
| AC_DEFUN([AM_PROG_INSTALL_SH], | |
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | |
| -install_sh=${install_sh-"$am_aux_dir/install-sh"} | |
| +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} | |
| AC_SUBST(install_sh)]) | |
| # Copyright (C) 2003, 2005 Free Software Foundation, Inc. | |
| @@ -6949,14 +7237,14 @@ | |
| # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | |
| -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 | |
| +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 | |
| # Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| -# serial 4 | |
| +# serial 5 | |
| # AM_MISSING_PROG(NAME, PROGRAM) | |
| # ------------------------------ | |
| @@ -6972,6 +7260,7 @@ | |
| # If it does, set am_missing_run to use it, otherwise, to nothing. | |
| AC_DEFUN([AM_MISSING_HAS_RUN], | |
| [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | |
| +AC_REQUIRE_AUX_FILE([missing])dnl | |
| test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" | |
| # Use eval to expand $SHELL | |
| if eval "$MISSING --run true"; then | |
| @@ -6982,7 +7271,7 @@ | |
| fi | |
| ]) | |
| -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. | |
| +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
| # | |
| # This file is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| @@ -6990,60 +7279,23 @@ | |
| # AM_PROG_MKDIR_P | |
| # --------------- | |
| -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. | |
| -# | |
| -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories | |
| -# created by `make install' are always world readable, even if the | |
| -# installer happens to have an overly restrictive umask (e.g. 077). | |
| -# This was a mistake. There are at least two reasons why we must not | |
| -# use `-m 0755': | |
| -# - it causes special bits like SGID to be ignored, | |
| -# - it may be too restrictive (some setups expect 775 directories). | |
| -# | |
| -# Do not use -m 0755 and let people choose whatever they expect by | |
| -# setting umask. | |
| -# | |
| -# We cannot accept any implementation of `mkdir' that recognizes `-p'. | |
| -# Some implementations (such as Solaris 8's) are not thread-safe: if a | |
| -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' | |
| -# concurrently, both version can detect that a/ is missing, but only | |
| -# one can create it and the other will error out. Consequently we | |
| -# restrict ourselves to GNU make (using the --version option ensures | |
| -# this.) | |
| +# Check for `mkdir -p'. | |
| AC_DEFUN([AM_PROG_MKDIR_P], | |
| -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then | |
| - # We used to keeping the `.' as first argument, in order to | |
| - # allow $(mkdir_p) to be used without argument. As in | |
| - # $(mkdir_p) $(somedir) | |
| - # where $(somedir) is conditionally defined. However this is wrong | |
| - # for two reasons: | |
| - # 1. if the package is installed by a user who cannot write `.' | |
| - # make install will fail, | |
| - # 2. the above comment should most certainly read | |
| - # $(mkdir_p) $(DESTDIR)$(somedir) | |
| - # so it does not work when $(somedir) is undefined and | |
| - # $(DESTDIR) is not. | |
| - # To support the latter case, we have to write | |
| - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), | |
| - # so the `.' trick is pointless. | |
| - mkdir_p='mkdir -p --' | |
| -else | |
| - # On NextStep and OpenStep, the `mkdir' command does not | |
| - # recognize any option. It will interpret all options as | |
| - # directories to create, and then abort because `.' already | |
| - # exists. | |
| - for d in ./-p ./--version; | |
| - do | |
| - test -d $d && rmdir $d | |
| - done | |
| - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. | |
| - if test -f "$ac_aux_dir/mkinstalldirs"; then | |
| - mkdir_p='$(mkinstalldirs)' | |
| - else | |
| - mkdir_p='$(install_sh) -d' | |
| - fi | |
| -fi | |
| -AC_SUBST([mkdir_p])]) | |
| +[AC_PREREQ([2.60])dnl | |
| +AC_REQUIRE([AC_PROG_MKDIR_P])dnl | |
| +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, | |
| +dnl while keeping a definition of mkdir_p for backward compatibility. | |
| +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. | |
| +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of | |
| +dnl Makefile.ins that do not define MKDIR_P, so we do our own | |
| +dnl adjustment using top_builddir (which is defined more often than | |
| +dnl MKDIR_P). | |
| +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl | |
| +case $mkdir_p in | |
| + [[\\/$]]* | ?:[[\\/]]*) ;; | |
| + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; | |
| +esac | |
| +]) | |
| # Helper functions for option handling. -*- Autoconf -*- | |
| @@ -7155,9 +7407,21 @@ | |
| if test "$cross_compiling" != no; then | |
| AC_CHECK_TOOL([STRIP], [strip], :) | |
| fi | |
| -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" | |
| +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | |
| AC_SUBST([INSTALL_STRIP_PROGRAM])]) | |
| +# Copyright (C) 2006 Free Software Foundation, Inc. | |
| +# | |
| +# This file is free software; the Free Software Foundation | |
| +# gives unlimited permission to copy and/or distribute it, | |
| +# with or without modifications, as long as this notice is preserved. | |
| + | |
| +# _AM_SUBST_NOTMAKE(VARIABLE) | |
| +# --------------------------- | |
| +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. | |
| +# This macro is traced by Automake. | |
| +AC_DEFUN([_AM_SUBST_NOTMAKE]) | |
| + | |
| # Check how to create a tarball. -*- Autoconf -*- | |
| # Copyright (C) 2004, 2005 Free Software Foundation, Inc. | |
| diff -aruN sysfsutils-2.1.0/cmd/Makefile.in sysfsutils-2.1.0.N/cmd/Makefile.in | |
| --- sysfsutils-2.1.0/cmd/Makefile.in 2006-08-23 01:38:56.000000000 -0700 | |
| +++ sysfsutils-2.1.0.N/cmd/Makefile.in 2008-12-09 13:18:07.000000000 -0800 | |
| @@ -1,8 +1,8 @@ | |
| -# Makefile.in generated by automake 1.9.6 from Makefile.am. | |
| +# Makefile.in generated by automake 1.10.1 from Makefile.am. | |
| # @configure_input@ | |
| # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| -# 2003, 2004, 2005 Free Software Foundation, Inc. | |
| +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
| # This Makefile.in is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -14,15 +14,11 @@ | |
| @SET_MAKE@ | |
| -srcdir = @srcdir@ | |
| -top_srcdir = @top_srcdir@ | |
| VPATH = @srcdir@ | |
| pkgdatadir = $(datadir)/@PACKAGE@ | |
| pkglibdir = $(libdir)/@PACKAGE@ | |
| pkgincludedir = $(includedir)/@PACKAGE@ | |
| -top_builddir = .. | |
| am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | |
| -INSTALL = @INSTALL@ | |
| install_sh_DATA = $(install_sh) -c -m 644 | |
| install_sh_PROGRAM = $(install_sh) -c | |
| install_sh_SCRIPT = $(install_sh) -c | |
| @@ -54,25 +50,24 @@ | |
| systool_OBJECTS = $(am_systool_OBJECTS) | |
| systool_LDADD = $(LDADD) | |
| systool_DEPENDENCIES = ../lib/libsysfs.la | |
| -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | |
| +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | |
| depcomp = $(SHELL) $(top_srcdir)/depcomp | |
| am__depfiles_maybe = depfiles | |
| COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | |
| $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ | |
| - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| - $(AM_CFLAGS) $(CFLAGS) | |
| +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | |
| + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | |
| + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| CCLD = $(CC) | |
| -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | |
| - $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | |
| + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | |
| + $(LDFLAGS) -o $@ | |
| SOURCES = $(systool_SOURCES) | |
| DIST_SOURCES = $(systool_SOURCES) | |
| ETAGS = etags | |
| CTAGS = ctags | |
| DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| ACLOCAL = @ACLOCAL@ | |
| -AMDEP_FALSE = @AMDEP_FALSE@ | |
| -AMDEP_TRUE = @AMDEP_TRUE@ | |
| AMTAR = @AMTAR@ | |
| AR = @AR@ | |
| AUTOCONF = @AUTOCONF@ | |
| @@ -91,6 +86,7 @@ | |
| CYGPATH_W = @CYGPATH_W@ | |
| DEFS = @DEFS@ | |
| DEPDIR = @DEPDIR@ | |
| +DSYMUTIL = @DSYMUTIL@ | |
| ECHO = @ECHO@ | |
| ECHO_C = @ECHO_C@ | |
| ECHO_N = @ECHO_N@ | |
| @@ -100,14 +96,14 @@ | |
| EXTRA_CFLAGS = @EXTRA_CFLAGS@ | |
| F77 = @F77@ | |
| FFLAGS = @FFLAGS@ | |
| +GREP = @GREP@ | |
| +INSTALL = @INSTALL@ | |
| INSTALL_DATA = @INSTALL_DATA@ | |
| INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | |
| KLCC = @KLCC@ | |
| KLIBC = @KLIBC@ | |
| -KLIBC_FALSE = @KLIBC_FALSE@ | |
| -KLIBC_TRUE = @KLIBC_TRUE@ | |
| LDFLAGS = @LDFLAGS@ | |
| LIBOBJS = @LIBOBJS@ | |
| LIBS = @LIBS@ | |
| @@ -115,6 +111,8 @@ | |
| LN_S = @LN_S@ | |
| LTLIBOBJS = @LTLIBOBJS@ | |
| MAKEINFO = @MAKEINFO@ | |
| +MKDIR_P = @MKDIR_P@ | |
| +NMEDIT = @NMEDIT@ | |
| OBJEXT = @OBJEXT@ | |
| PACKAGE = @PACKAGE@ | |
| PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |
| @@ -124,20 +122,18 @@ | |
| PACKAGE_VERSION = @PACKAGE_VERSION@ | |
| PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| RANLIB = @RANLIB@ | |
| +SED = @SED@ | |
| SET_MAKE = @SET_MAKE@ | |
| SHELL = @SHELL@ | |
| STRIP = @STRIP@ | |
| VERSION = @VERSION@ | |
| -ac_ct_AR = @ac_ct_AR@ | |
| +abs_builddir = @abs_builddir@ | |
| +abs_srcdir = @abs_srcdir@ | |
| +abs_top_builddir = @abs_top_builddir@ | |
| +abs_top_srcdir = @abs_top_srcdir@ | |
| ac_ct_CC = @ac_ct_CC@ | |
| ac_ct_CXX = @ac_ct_CXX@ | |
| ac_ct_F77 = @ac_ct_F77@ | |
| -ac_ct_RANLIB = @ac_ct_RANLIB@ | |
| -ac_ct_STRIP = @ac_ct_STRIP@ | |
| -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ | |
| -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ | |
| -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ | |
| -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ | |
| am__include = @am__include@ | |
| am__leading_dot = @am__leading_dot@ | |
| am__quote = @am__quote@ | |
| @@ -149,30 +145,41 @@ | |
| build_cpu = @build_cpu@ | |
| build_os = @build_os@ | |
| build_vendor = @build_vendor@ | |
| +builddir = @builddir@ | |
| datadir = @datadir@ | |
| +datarootdir = @datarootdir@ | |
| +docdir = @docdir@ | |
| +dvidir = @dvidir@ | |
| exec_prefix = @exec_prefix@ | |
| host = @host@ | |
| host_alias = @host_alias@ | |
| host_cpu = @host_cpu@ | |
| host_os = @host_os@ | |
| host_vendor = @host_vendor@ | |
| +htmldir = @htmldir@ | |
| includedir = @includedir@ | |
| infodir = @infodir@ | |
| install_sh = @install_sh@ | |
| libdir = @libdir@ | |
| libexecdir = @libexecdir@ | |
| +localedir = @localedir@ | |
| localstatedir = @localstatedir@ | |
| mandir = @mandir@ | |
| mkdir_p = @mkdir_p@ | |
| oldincludedir = @oldincludedir@ | |
| +pdfdir = @pdfdir@ | |
| prefix = @prefix@ | |
| program_transform_name = @program_transform_name@ | |
| +psdir = @psdir@ | |
| sbindir = @sbindir@ | |
| sharedstatedir = @sharedstatedir@ | |
| +srcdir = @srcdir@ | |
| sysconfdir = @sysconfdir@ | |
| target_alias = @target_alias@ | |
| +top_builddir = @top_builddir@ | |
| +top_srcdir = @top_srcdir@ | |
| systool_SOURCES = systool.c names.c names.h | |
| -INCLUDES = -I../include | |
| +INCLUDES = -I$(top_srcdir)/include | |
| LDADD = ../lib/libsysfs.la | |
| AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CFLAGS) | |
| all: all-am | |
| @@ -210,15 +217,15 @@ | |
| cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| install-binPROGRAMS: $(bin_PROGRAMS) | |
| @$(NORMAL_INSTALL) | |
| - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" | |
| + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" | |
| @list='$(bin_PROGRAMS)'; for p in $$list; do \ | |
| p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ | |
| if test -f $$p \ | |
| || test -f $$p1 \ | |
| ; then \ | |
| f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ | |
| - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ | |
| - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ | |
| + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ | |
| + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ | |
| else :; fi; \ | |
| done | |
| @@ -238,7 +245,7 @@ | |
| done | |
| systool$(EXEEXT): $(systool_OBJECTS) $(systool_DEPENDENCIES) | |
| @rm -f systool$(EXEEXT) | |
| - $(LINK) $(systool_LDFLAGS) $(systool_OBJECTS) $(systool_LDADD) $(LIBS) | |
| + $(LINK) $(systool_OBJECTS) $(systool_LDADD) $(LIBS) | |
| mostlyclean-compile: | |
| -rm -f *.$(OBJEXT) | |
| @@ -250,22 +257,22 @@ | |
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/systool.Po@am__quote@ | |
| .c.o: | |
| -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(COMPILE) -c $< | |
| .c.obj: | |
| -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | |
| .c.lo: | |
| -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | |
| @@ -276,17 +283,13 @@ | |
| clean-libtool: | |
| -rm -rf .libs _libs | |
| -distclean-libtool: | |
| - -rm -f libtool | |
| -uninstall-info-am: | |
| - | |
| ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | |
| list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| mkid -fID $$unique | |
| tags: TAGS | |
| @@ -298,8 +301,8 @@ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | |
| test -n "$$unique" || unique=$$empty_fix; \ | |
| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| @@ -309,13 +312,12 @@ | |
| CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | |
| $(TAGS_FILES) $(LISP) | |
| tags=; \ | |
| - here=`pwd`; \ | |
| list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| test -z "$(CTAGS_ARGS)$$tags$$unique" \ | |
| || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | |
| $$tags $$unique | |
| @@ -329,22 +331,21 @@ | |
| -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | |
| distdir: $(DISTFILES) | |
| - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ | |
| - list='$(DISTFILES)'; for file in $$list; do \ | |
| - case $$file in \ | |
| - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ | |
| - esac; \ | |
| + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + list='$(DISTFILES)'; \ | |
| + dist_files=`for file in $$list; do echo $$file; done | \ | |
| + sed -e "s|^$$srcdirstrip/||;t" \ | |
| + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | |
| + case $$dist_files in \ | |
| + */*) $(MKDIR_P) `echo "$$dist_files" | \ | |
| + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | |
| + sort -u` ;; \ | |
| + esac; \ | |
| + for file in $$dist_files; do \ | |
| if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | |
| - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ | |
| - dir="/$$dir"; \ | |
| - $(mkdir_p) "$(distdir)$$dir"; \ | |
| - else \ | |
| - dir=''; \ | |
| - fi; \ | |
| if test -d $$d/$$file; then \ | |
| + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | |
| cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | |
| fi; \ | |
| @@ -360,7 +361,7 @@ | |
| all-am: Makefile $(PROGRAMS) | |
| installdirs: | |
| for dir in "$(DESTDIR)$(bindir)"; do \ | |
| - test -z "$$dir" || $(mkdir_p) "$$dir"; \ | |
| + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | |
| done | |
| install: install-am | |
| install-exec: install-exec-am | |
| @@ -394,7 +395,7 @@ | |
| -rm -rf ./$(DEPDIR) | |
| -rm -f Makefile | |
| distclean-am: clean-am distclean-compile distclean-generic \ | |
| - distclean-libtool distclean-tags | |
| + distclean-tags | |
| dvi: dvi-am | |
| @@ -408,12 +409,20 @@ | |
| install-data-am: | |
| +install-dvi: install-dvi-am | |
| + | |
| install-exec-am: install-binPROGRAMS | |
| +install-html: install-html-am | |
| + | |
| install-info: install-info-am | |
| install-man: | |
| +install-pdf: install-pdf-am | |
| + | |
| +install-ps: install-ps-am | |
| + | |
| installcheck-am: | |
| maintainer-clean: maintainer-clean-am | |
| @@ -434,19 +443,23 @@ | |
| ps-am: | |
| -uninstall-am: uninstall-binPROGRAMS uninstall-info-am | |
| +uninstall-am: uninstall-binPROGRAMS | |
| + | |
| +.MAKE: install-am install-strip | |
| .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ | |
| clean-generic clean-libtool ctags distclean distclean-compile \ | |
| distclean-generic distclean-libtool distclean-tags distdir dvi \ | |
| dvi-am html html-am info info-am install install-am \ | |
| - install-binPROGRAMS install-data install-data-am install-exec \ | |
| - install-exec-am install-info install-info-am install-man \ | |
| + install-binPROGRAMS install-data install-data-am install-dvi \ | |
| + install-dvi-am install-exec install-exec-am install-html \ | |
| + install-html-am install-info install-info-am install-man \ | |
| + install-pdf install-pdf-am install-ps install-ps-am \ | |
| install-strip installcheck installcheck-am installdirs \ | |
| maintainer-clean maintainer-clean-generic mostlyclean \ | |
| mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | |
| pdf pdf-am ps ps-am tags uninstall uninstall-am \ | |
| - uninstall-binPROGRAMS uninstall-info-am | |
| + uninstall-binPROGRAMS | |
| # Tell versions [3.59,3.63) of GNU make to not export all variables. | |
| # Otherwise a system limit (for SysV at least) may be exceeded. | |
| diff -aruN sysfsutils-2.1.0/configure sysfsutils-2.1.0.N/configure | |
| --- sysfsutils-2.1.0/configure 2006-08-23 01:38:52.000000000 -0700 | |
| +++ sysfsutils-2.1.0.N/configure 2008-12-09 13:18:04.000000000 -0800 | |
| @@ -1,27 +1,56 @@ | |
| #! /bin/sh | |
| # Guess values for system-dependent variables and create Makefiles. | |
| -# Generated by GNU Autoconf 2.59 for sysfsutils 2.1.0. | |
| +# Generated by GNU Autoconf 2.61 for sysfsutils 2.1.0. | |
| # | |
| # Report bugs to <linux-diag-devel@lists.sourceforge.net>. | |
| # | |
| -# Copyright (C) 2003 Free Software Foundation, Inc. | |
| +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
| +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
| # This configure script is free software; the Free Software Foundation | |
| # gives unlimited permission to copy, distribute and modify it. | |
| ## --------------------- ## | |
| ## M4sh Initialization. ## | |
| ## --------------------- ## | |
| -# Be Bourne compatible | |
| +# Be more Bourne compatible | |
| +DUALCASE=1; export DUALCASE # for MKS sh | |
| if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
| emulate sh | |
| NULLCMD=: | |
| # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
| # is contrary to our usage. Disable this feature. | |
| alias -g '${1+"$@"}'='"$@"' | |
| -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | |
| - set -o posix | |
| + setopt NO_GLOB_SUBST | |
| +else | |
| + case `(set -o) 2>/dev/null` in | |
| + *posix*) set -o posix ;; | |
| +esac | |
| + | |
| +fi | |
| + | |
| + | |
| + | |
| + | |
| +# PATH needs CR | |
| +# Avoid depending upon Character Ranges. | |
| +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | |
| +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | |
| +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | |
| +as_cr_digits='0123456789' | |
| +as_cr_alnum=$as_cr_Letters$as_cr_digits | |
| + | |
| +# The user is always right. | |
| +if test "${PATH_SEPARATOR+set}" != set; then | |
| + echo "#! /bin/sh" >conf$$.sh | |
| + echo "exit 0" >>conf$$.sh | |
| + chmod +x conf$$.sh | |
| + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |
| + PATH_SEPARATOR=';' | |
| + else | |
| + PATH_SEPARATOR=: | |
| + fi | |
| + rm -f conf$$.sh | |
| fi | |
| -DUALCASE=1; export DUALCASE # for MKS sh | |
| # Support unset when possible. | |
| if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | |
| @@ -31,8 +60,43 @@ | |
| fi | |
| +# IFS | |
| +# We need space, tab and new line, in precisely that order. Quoting is | |
| +# there to prevent editors from complaining about space-tab. | |
| +# (If _AS_PATH_WALK were called with IFS unset, it would disable word | |
| +# splitting by setting IFS to empty value.) | |
| +as_nl=' | |
| +' | |
| +IFS=" "" $as_nl" | |
| + | |
| +# Find who we are. Look in the path if we contain no directory separator. | |
| +case $0 in | |
| + *[\\/]* ) as_myself=$0 ;; | |
| + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | |
| +done | |
| +IFS=$as_save_IFS | |
| + | |
| + ;; | |
| +esac | |
| +# We did not find ourselves, most probably we were run as `sh COMMAND' | |
| +# in which case we are not to be found in the path. | |
| +if test "x$as_myself" = x; then | |
| + as_myself=$0 | |
| +fi | |
| +if test ! -f "$as_myself"; then | |
| + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | |
| + { (exit 1); exit 1; } | |
| +fi | |
| + | |
| # Work around bugs in pre-3.0 UWIN ksh. | |
| -$as_unset ENV MAIL MAILPATH | |
| +for as_var in ENV MAIL MAILPATH | |
| +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
| +done | |
| PS1='$ ' | |
| PS2='> ' | |
| PS4='+ ' | |
| @@ -46,18 +110,19 @@ | |
| if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | |
| eval $as_var=C; export $as_var | |
| else | |
| - $as_unset $as_var | |
| + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
| fi | |
| done | |
| # Required to use basename. | |
| -if expr a : '\(a\)' >/dev/null 2>&1; then | |
| +if expr a : '\(a\)' >/dev/null 2>&1 && | |
| + test "X`expr 00001 : '.*\(...\)'`" = X001; then | |
| as_expr=expr | |
| else | |
| as_expr=false | |
| fi | |
| -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | |
| +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | |
| as_basename=basename | |
| else | |
| as_basename=false | |
| @@ -65,157 +130,388 @@ | |
| # Name of the executable. | |
| -as_me=`$as_basename "$0" || | |
| +as_me=`$as_basename -- "$0" || | |
| $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | |
| X"$0" : 'X\(//\)$' \| \ | |
| - X"$0" : 'X\(/\)$' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$0" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X/"$0" | | |
| - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | |
| - /^X\/\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\/\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| + sed '/^.*\/\([^/][^/]*\)\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\/\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\/\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| +# CDPATH. | |
| +$as_unset CDPATH | |
| -# PATH needs CR, and LINENO needs CR and PATH. | |
| -# Avoid depending upon Character Ranges. | |
| -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | |
| -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | |
| -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | |
| -as_cr_digits='0123456789' | |
| -as_cr_alnum=$as_cr_Letters$as_cr_digits | |
| -# The user is always right. | |
| -if test "${PATH_SEPARATOR+set}" != set; then | |
| - echo "#! /bin/sh" >conf$$.sh | |
| - echo "exit 0" >>conf$$.sh | |
| - chmod +x conf$$.sh | |
| - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |
| - PATH_SEPARATOR=';' | |
| - else | |
| - PATH_SEPARATOR=: | |
| - fi | |
| - rm -f conf$$.sh | |
| +if test "x$CONFIG_SHELL" = x; then | |
| + if (eval ":") 2>/dev/null; then | |
| + as_have_required=yes | |
| +else | |
| + as_have_required=no | |
| fi | |
| + if test $as_have_required = yes && (eval ": | |
| +(as_func_return () { | |
| + (exit \$1) | |
| +} | |
| +as_func_success () { | |
| + as_func_return 0 | |
| +} | |
| +as_func_failure () { | |
| + as_func_return 1 | |
| +} | |
| +as_func_ret_success () { | |
| + return 0 | |
| +} | |
| +as_func_ret_failure () { | |
| + return 1 | |
| +} | |
| - as_lineno_1=$LINENO | |
| - as_lineno_2=$LINENO | |
| - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | |
| - test "x$as_lineno_1" != "x$as_lineno_2" && | |
| - test "x$as_lineno_3" = "x$as_lineno_2" || { | |
| - # Find who we are. Look in the path if we contain no path at all | |
| - # relative or not. | |
| - case $0 in | |
| - *[\\/]* ) as_myself=$0 ;; | |
| - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | |
| -done | |
| +exitcode=0 | |
| +if as_func_success; then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo as_func_success failed. | |
| +fi | |
| - ;; | |
| - esac | |
| - # We did not find ourselves, most probably we were run as `sh COMMAND' | |
| - # in which case we are not to be found in the path. | |
| - if test "x$as_myself" = x; then | |
| - as_myself=$0 | |
| - fi | |
| - if test ! -f "$as_myself"; then | |
| - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 | |
| - { (exit 1); exit 1; }; } | |
| - fi | |
| - case $CONFIG_SHELL in | |
| - '') | |
| +if as_func_failure; then | |
| + exitcode=1 | |
| + echo as_func_failure succeeded. | |
| +fi | |
| + | |
| +if as_func_ret_success; then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo as_func_ret_success failed. | |
| +fi | |
| + | |
| +if as_func_ret_failure; then | |
| + exitcode=1 | |
| + echo as_func_ret_failure succeeded. | |
| +fi | |
| + | |
| +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo positional parameters were not saved. | |
| +fi | |
| + | |
| +test \$exitcode = 0) || { (exit 1); exit 1; } | |
| + | |
| +( | |
| + as_lineno_1=\$LINENO | |
| + as_lineno_2=\$LINENO | |
| + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && | |
| + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } | |
| +") 2> /dev/null; then | |
| + : | |
| +else | |
| + as_candidate_shells= | |
| as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | |
| do | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| - for as_base in sh bash ksh sh5; do | |
| - case $as_dir in | |
| + case $as_dir in | |
| /*) | |
| - if ("$as_dir/$as_base" -c ' | |
| + for as_base in sh bash ksh sh5; do | |
| + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" | |
| + done;; | |
| + esac | |
| +done | |
| +IFS=$as_save_IFS | |
| + | |
| + | |
| + for as_shell in $as_candidate_shells $SHELL; do | |
| + # Try only shells that exist, to save several forks. | |
| + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && | |
| + { ("$as_shell") 2> /dev/null <<\_ASEOF | |
| +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
| + emulate sh | |
| + NULLCMD=: | |
| + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
| + # is contrary to our usage. Disable this feature. | |
| + alias -g '${1+"$@"}'='"$@"' | |
| + setopt NO_GLOB_SUBST | |
| +else | |
| + case `(set -o) 2>/dev/null` in | |
| + *posix*) set -o posix ;; | |
| +esac | |
| + | |
| +fi | |
| + | |
| + | |
| +: | |
| +_ASEOF | |
| +}; then | |
| + CONFIG_SHELL=$as_shell | |
| + as_have_required=yes | |
| + if { "$as_shell" 2> /dev/null <<\_ASEOF | |
| +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
| + emulate sh | |
| + NULLCMD=: | |
| + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
| + # is contrary to our usage. Disable this feature. | |
| + alias -g '${1+"$@"}'='"$@"' | |
| + setopt NO_GLOB_SUBST | |
| +else | |
| + case `(set -o) 2>/dev/null` in | |
| + *posix*) set -o posix ;; | |
| +esac | |
| + | |
| +fi | |
| + | |
| + | |
| +: | |
| +(as_func_return () { | |
| + (exit $1) | |
| +} | |
| +as_func_success () { | |
| + as_func_return 0 | |
| +} | |
| +as_func_failure () { | |
| + as_func_return 1 | |
| +} | |
| +as_func_ret_success () { | |
| + return 0 | |
| +} | |
| +as_func_ret_failure () { | |
| + return 1 | |
| +} | |
| + | |
| +exitcode=0 | |
| +if as_func_success; then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo as_func_success failed. | |
| +fi | |
| + | |
| +if as_func_failure; then | |
| + exitcode=1 | |
| + echo as_func_failure succeeded. | |
| +fi | |
| + | |
| +if as_func_ret_success; then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo as_func_ret_success failed. | |
| +fi | |
| + | |
| +if as_func_ret_failure; then | |
| + exitcode=1 | |
| + echo as_func_ret_failure succeeded. | |
| +fi | |
| + | |
| +if ( set x; as_func_ret_success y && test x = "$1" ); then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo positional parameters were not saved. | |
| +fi | |
| + | |
| +test $exitcode = 0) || { (exit 1); exit 1; } | |
| + | |
| +( | |
| as_lineno_1=$LINENO | |
| as_lineno_2=$LINENO | |
| - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | |
| test "x$as_lineno_1" != "x$as_lineno_2" && | |
| - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | |
| - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | |
| - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | |
| - CONFIG_SHELL=$as_dir/$as_base | |
| - export CONFIG_SHELL | |
| - exec "$CONFIG_SHELL" "$0" ${1+"$@"} | |
| - fi;; | |
| - esac | |
| - done | |
| -done | |
| -;; | |
| - esac | |
| + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } | |
| + | |
| +_ASEOF | |
| +}; then | |
| + break | |
| +fi | |
| + | |
| +fi | |
| + | |
| + done | |
| + | |
| + if test "x$CONFIG_SHELL" != x; then | |
| + for as_var in BASH_ENV ENV | |
| + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
| + done | |
| + export CONFIG_SHELL | |
| + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} | |
| +fi | |
| + | |
| + | |
| + if test $as_have_required = no; then | |
| + echo This script requires a shell more modern than all the | |
| + echo shells that I found on your system. Please install a | |
| + echo modern shell, or manually run the script under such a | |
| + echo shell if you do have one. | |
| + { (exit 1); exit 1; } | |
| +fi | |
| + | |
| + | |
| +fi | |
| + | |
| +fi | |
| + | |
| + | |
| + | |
| +(eval "as_func_return () { | |
| + (exit \$1) | |
| +} | |
| +as_func_success () { | |
| + as_func_return 0 | |
| +} | |
| +as_func_failure () { | |
| + as_func_return 1 | |
| +} | |
| +as_func_ret_success () { | |
| + return 0 | |
| +} | |
| +as_func_ret_failure () { | |
| + return 1 | |
| +} | |
| + | |
| +exitcode=0 | |
| +if as_func_success; then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo as_func_success failed. | |
| +fi | |
| + | |
| +if as_func_failure; then | |
| + exitcode=1 | |
| + echo as_func_failure succeeded. | |
| +fi | |
| + | |
| +if as_func_ret_success; then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo as_func_ret_success failed. | |
| +fi | |
| + | |
| +if as_func_ret_failure; then | |
| + exitcode=1 | |
| + echo as_func_ret_failure succeeded. | |
| +fi | |
| + | |
| +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then | |
| + : | |
| +else | |
| + exitcode=1 | |
| + echo positional parameters were not saved. | |
| +fi | |
| + | |
| +test \$exitcode = 0") || { | |
| + echo No shell found that supports shell functions. | |
| + echo Please tell autoconf@gnu.org about your system, | |
| + echo including any error possibly output before this | |
| + echo message | |
| +} | |
| + | |
| + | |
| + | |
| + as_lineno_1=$LINENO | |
| + as_lineno_2=$LINENO | |
| + test "x$as_lineno_1" != "x$as_lineno_2" && | |
| + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | |
| # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | |
| # uniformly replaced by the line number. The first 'sed' inserts a | |
| - # line-number line before each line; the second 'sed' does the real | |
| - # work. The second script uses 'N' to pair each line-number line | |
| - # with the numbered line, and appends trailing '-' during | |
| - # substitution so that $LINENO is not a special case at line end. | |
| + # line-number line after each line using $LINENO; the second 'sed' | |
| + # does the real work. The second script uses 'N' to pair each | |
| + # line-number line with the line containing $LINENO, and appends | |
| + # trailing '-' during substitution so that $LINENO is not a special | |
| + # case at line end. | |
| # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | |
| - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | |
| - sed '=' <$as_myself | | |
| + # scripts with optimization help from Paolo Bonzini. Blame Lee | |
| + # E. McMahon (1931-1989) for sed's syntax. :-) | |
| + sed -n ' | |
| + p | |
| + /[$]LINENO/= | |
| + ' <$as_myself | | |
| sed ' | |
| + s/[$]LINENO.*/&-/ | |
| + t lineno | |
| + b | |
| + :lineno | |
| N | |
| - s,$,-, | |
| - : loop | |
| - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | |
| + :loop | |
| + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | |
| t loop | |
| - s,-$,, | |
| - s,^['$as_cr_digits']*\n,, | |
| + s/-\n.*// | |
| ' >$as_me.lineno && | |
| - chmod +x $as_me.lineno || | |
| + chmod +x "$as_me.lineno" || | |
| { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | |
| { (exit 1); exit 1; }; } | |
| # Don't try to exec as it changes $[0], causing all sort of problems | |
| # (the dirname of $[0] is not the place where we might find the | |
| - # original and so on. Autoconf is especially sensible to this). | |
| - . ./$as_me.lineno | |
| + # original and so on. Autoconf is especially sensitive to this). | |
| + . "./$as_me.lineno" | |
| # Exit status is that of the last command. | |
| exit | |
| } | |
| -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | |
| - *c*,-n*) ECHO_N= ECHO_C=' | |
| -' ECHO_T=' ' ;; | |
| - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | |
| - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | |
| +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | |
| + as_dirname=dirname | |
| +else | |
| + as_dirname=false | |
| +fi | |
| + | |
| +ECHO_C= ECHO_N= ECHO_T= | |
| +case `echo -n x` in | |
| +-n*) | |
| + case `echo 'x\c'` in | |
| + *c*) ECHO_T=' ';; # ECHO_T is single tab character. | |
| + *) ECHO_C='\c';; | |
| + esac;; | |
| +*) | |
| + ECHO_N='-n';; | |
| esac | |
| -if expr a : '\(a\)' >/dev/null 2>&1; then | |
| +if expr a : '\(a\)' >/dev/null 2>&1 && | |
| + test "X`expr 00001 : '.*\(...\)'`" = X001; then | |
| as_expr=expr | |
| else | |
| as_expr=false | |
| fi | |
| rm -f conf$$ conf$$.exe conf$$.file | |
| +if test -d conf$$.dir; then | |
| + rm -f conf$$.dir/conf$$.file | |
| +else | |
| + rm -f conf$$.dir | |
| + mkdir conf$$.dir | |
| +fi | |
| echo >conf$$.file | |
| if ln -s conf$$.file conf$$ 2>/dev/null; then | |
| - # We could just check for DJGPP; but this test a) works b) is more generic | |
| - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). | |
| - if test -f conf$$.exe; then | |
| - # Don't use ln at all; we don't have any links | |
| + as_ln_s='ln -s' | |
| + # ... but there are two gotchas: | |
| + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | |
| + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | |
| + # In both cases, we have to default to `cp -p'. | |
| + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | |
| as_ln_s='cp -p' | |
| - else | |
| - as_ln_s='ln -s' | |
| - fi | |
| elif ln conf$$.file conf$$ 2>/dev/null; then | |
| as_ln_s=ln | |
| else | |
| as_ln_s='cp -p' | |
| fi | |
| -rm -f conf$$ conf$$.exe conf$$.file | |
| +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | |
| +rmdir conf$$.dir 2>/dev/null | |
| if mkdir -p . 2>/dev/null; then | |
| as_mkdir_p=: | |
| @@ -224,7 +520,28 @@ | |
| as_mkdir_p=false | |
| fi | |
| -as_executable_p="test -f" | |
| +if test -x / >/dev/null 2>&1; then | |
| + as_test_x='test -x' | |
| +else | |
| + if ls -dL / >/dev/null 2>&1; then | |
| + as_ls_L_option=L | |
| + else | |
| + as_ls_L_option= | |
| + fi | |
| + as_test_x=' | |
| + eval sh -c '\'' | |
| + if test -d "$1"; then | |
| + test -d "$1/."; | |
| + else | |
| + case $1 in | |
| + -*)set "./$1";; | |
| + esac; | |
| + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
| + ???[sx]*):;;*)false;;esac;fi | |
| + '\'' sh | |
| + ' | |
| +fi | |
| +as_executable_p=$as_test_x | |
| # Sed expression to map a string onto a valid CPP name. | |
| as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |
| @@ -233,15 +550,6 @@ | |
| as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | |
| -# IFS | |
| -# We need space, tab and new line, in precisely that order. | |
| -as_nl=' | |
| -' | |
| -IFS=" $as_nl" | |
| - | |
| -# CDPATH. | |
| -$as_unset CDPATH | |
| - | |
| # Check that we are running under the correct shell. | |
| @@ -397,29 +705,26 @@ | |
| tagnames=${tagnames+${tagnames},}F77 | |
| +exec 7<&0 </dev/null 6>&1 | |
| + | |
| # Name of the host. | |
| # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | |
| # so uname gets run too. | |
| ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | |
| -exec 6>&1 | |
| - | |
| # | |
| # Initializations. | |
| # | |
| ac_default_prefix=/usr/local | |
| +ac_clean_files= | |
| ac_config_libobj_dir=. | |
| +LIBOBJS= | |
| cross_compiling=no | |
| subdirs= | |
| MFLAGS= | |
| MAKEFLAGS= | |
| SHELL=${CONFIG_SHELL-/bin/sh} | |
| -# Maximum number of lines to put in a shell here document. | |
| -# This variable seems obsolete. It should probably be removed, and | |
| -# only ac_max_sed_lines should be used. | |
| -: ${ac_max_here_lines=38} | |
| - | |
| # Identity of this package. | |
| PACKAGE_NAME='sysfsutils' | |
| PACKAGE_TARNAME='sysfsutils' | |
| @@ -431,42 +736,167 @@ | |
| # Factoring default headers for most tests. | |
| ac_includes_default="\ | |
| #include <stdio.h> | |
| -#if HAVE_SYS_TYPES_H | |
| +#ifdef HAVE_SYS_TYPES_H | |
| # include <sys/types.h> | |
| #endif | |
| -#if HAVE_SYS_STAT_H | |
| +#ifdef HAVE_SYS_STAT_H | |
| # include <sys/stat.h> | |
| #endif | |
| -#if STDC_HEADERS | |
| +#ifdef STDC_HEADERS | |
| # include <stdlib.h> | |
| # include <stddef.h> | |
| #else | |
| -# if HAVE_STDLIB_H | |
| +# ifdef HAVE_STDLIB_H | |
| # include <stdlib.h> | |
| # endif | |
| #endif | |
| -#if HAVE_STRING_H | |
| -# if !STDC_HEADERS && HAVE_MEMORY_H | |
| +#ifdef HAVE_STRING_H | |
| +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H | |
| # include <memory.h> | |
| # endif | |
| # include <string.h> | |
| #endif | |
| -#if HAVE_STRINGS_H | |
| +#ifdef HAVE_STRINGS_H | |
| # include <strings.h> | |
| #endif | |
| -#if HAVE_INTTYPES_H | |
| +#ifdef HAVE_INTTYPES_H | |
| # include <inttypes.h> | |
| -#else | |
| -# if HAVE_STDINT_H | |
| -# include <stdint.h> | |
| -# endif | |
| #endif | |
| -#if HAVE_UNISTD_H | |
| +#ifdef HAVE_STDINT_H | |
| +# include <stdint.h> | |
| +#endif | |
| +#ifdef HAVE_UNISTD_H | |
| # include <unistd.h> | |
| #endif" | |
| -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os KLCC KLIBC KLIBC_TRUE KLIBC_FALSE EXTRA_CFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS' | |
| +ac_subst_vars='SHELL | |
| +PATH_SEPARATOR | |
| +PACKAGE_NAME | |
| +PACKAGE_TARNAME | |
| +PACKAGE_VERSION | |
| +PACKAGE_STRING | |
| +PACKAGE_BUGREPORT | |
| +exec_prefix | |
| +prefix | |
| +program_transform_name | |
| +bindir | |
| +sbindir | |
| +libexecdir | |
| +datarootdir | |
| +datadir | |
| +sysconfdir | |
| +sharedstatedir | |
| +localstatedir | |
| +includedir | |
| +oldincludedir | |
| +docdir | |
| +infodir | |
| +htmldir | |
| +dvidir | |
| +pdfdir | |
| +psdir | |
| +libdir | |
| +localedir | |
| +mandir | |
| +DEFS | |
| +ECHO_C | |
| +ECHO_N | |
| +ECHO_T | |
| +LIBS | |
| +build_alias | |
| +host_alias | |
| +target_alias | |
| +INSTALL_PROGRAM | |
| +INSTALL_SCRIPT | |
| +INSTALL_DATA | |
| +am__isrc | |
| +CYGPATH_W | |
| +PACKAGE | |
| +VERSION | |
| +ACLOCAL | |
| +AUTOCONF | |
| +AUTOMAKE | |
| +AUTOHEADER | |
| +MAKEINFO | |
| +install_sh | |
| +STRIP | |
| +INSTALL_STRIP_PROGRAM | |
| +mkdir_p | |
| +AWK | |
| +SET_MAKE | |
| +am__leading_dot | |
| +AMTAR | |
| +am__tar | |
| +am__untar | |
| +build | |
| +build_cpu | |
| +build_vendor | |
| +build_os | |
| +host | |
| +host_cpu | |
| +host_vendor | |
| +host_os | |
| +KLCC | |
| +KLIBC | |
| +KLIBC_TRUE | |
| +KLIBC_FALSE | |
| +EXTRA_CFLAGS | |
| +CC | |
| +CFLAGS | |
| +LDFLAGS | |
| +CPPFLAGS | |
| +ac_ct_CC | |
| +EXEEXT | |
| +OBJEXT | |
| +DEPDIR | |
| +am__include | |
| +am__quote | |
| +AMDEP_TRUE | |
| +AMDEP_FALSE | |
| +AMDEPBACKSLASH | |
| +CCDEPMODE | |
| +am__fastdepCC_TRUE | |
| +am__fastdepCC_FALSE | |
| +SED | |
| +GREP | |
| +EGREP | |
| +LN_S | |
| +ECHO | |
| +AR | |
| +RANLIB | |
| +DSYMUTIL | |
| +NMEDIT | |
| +CPP | |
| +CXX | |
| +CXXFLAGS | |
| +ac_ct_CXX | |
| +CXXDEPMODE | |
| +am__fastdepCXX_TRUE | |
| +am__fastdepCXX_FALSE | |
| +CXXCPP | |
| +F77 | |
| +FFLAGS | |
| +ac_ct_F77 | |
| +LIBTOOL | |
| +LIBOBJS | |
| +LTLIBOBJS' | |
| ac_subst_files='' | |
| + ac_precious_vars='build_alias | |
| +host_alias | |
| +target_alias | |
| +CC | |
| +CFLAGS | |
| +LDFLAGS | |
| +LIBS | |
| +CPPFLAGS | |
| +CPP | |
| +CXX | |
| +CXXFLAGS | |
| +CCC | |
| +CXXCPP | |
| +F77 | |
| +FFLAGS' | |
| + | |
| # Initialize some variables set by options. | |
| ac_init_help= | |
| @@ -493,34 +923,48 @@ | |
| # and all the variables that are supposed to be based on exec_prefix | |
| # by default will actually change. | |
| # Use braces instead of parens because sh, perl, etc. also accept them. | |
| +# (The list follows the same order as the GNU Coding Standards.) | |
| bindir='${exec_prefix}/bin' | |
| sbindir='${exec_prefix}/sbin' | |
| libexecdir='${exec_prefix}/libexec' | |
| -datadir='${prefix}/share' | |
| +datarootdir='${prefix}/share' | |
| +datadir='${datarootdir}' | |
| sysconfdir='${prefix}/etc' | |
| sharedstatedir='${prefix}/com' | |
| localstatedir='${prefix}/var' | |
| -libdir='${exec_prefix}/lib' | |
| includedir='${prefix}/include' | |
| oldincludedir='/usr/include' | |
| -infodir='${prefix}/info' | |
| -mandir='${prefix}/man' | |
| +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' | |
| +infodir='${datarootdir}/info' | |
| +htmldir='${docdir}' | |
| +dvidir='${docdir}' | |
| +pdfdir='${docdir}' | |
| +psdir='${docdir}' | |
| +libdir='${exec_prefix}/lib' | |
| +localedir='${datarootdir}/locale' | |
| +mandir='${datarootdir}/man' | |
| ac_prev= | |
| +ac_dashdash= | |
| for ac_option | |
| do | |
| # If the previous option needs an argument, assign it. | |
| if test -n "$ac_prev"; then | |
| - eval "$ac_prev=\$ac_option" | |
| + eval $ac_prev=\$ac_option | |
| ac_prev= | |
| continue | |
| fi | |
| - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` | |
| + case $ac_option in | |
| + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | |
| + *) ac_optarg=yes ;; | |
| + esac | |
| # Accept the important Cygnus configure options, so we can diagnose typos. | |
| - case $ac_option in | |
| + case $ac_dashdash$ac_option in | |
| + --) | |
| + ac_dashdash=yes ;; | |
| -bindir | --bindir | --bindi | --bind | --bin | --bi) | |
| ac_prev=bindir ;; | |
| @@ -542,33 +986,45 @@ | |
| --config-cache | -C) | |
| cache_file=config.cache ;; | |
| - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) | |
| + -datadir | --datadir | --datadi | --datad) | |
| ac_prev=datadir ;; | |
| - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | |
| - | --da=*) | |
| + -datadir=* | --datadir=* | --datadi=* | --datad=*) | |
| datadir=$ac_optarg ;; | |
| + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ | |
| + | --dataroo | --dataro | --datar) | |
| + ac_prev=datarootdir ;; | |
| + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ | |
| + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) | |
| + datarootdir=$ac_optarg ;; | |
| + | |
| -disable-* | --disable-*) | |
| ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | |
| # Reject names that are not valid shell variable names. | |
| - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
| + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
| { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
| { (exit 1); exit 1; }; } | |
| - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | |
| - eval "enable_$ac_feature=no" ;; | |
| + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
| + eval enable_$ac_feature=no ;; | |
| + | |
| + -docdir | --docdir | --docdi | --doc | --do) | |
| + ac_prev=docdir ;; | |
| + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) | |
| + docdir=$ac_optarg ;; | |
| + | |
| + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) | |
| + ac_prev=dvidir ;; | |
| + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) | |
| + dvidir=$ac_optarg ;; | |
| -enable-* | --enable-*) | |
| ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | |
| # Reject names that are not valid shell variable names. | |
| - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
| + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
| { echo "$as_me: error: invalid feature name: $ac_feature" >&2 | |
| { (exit 1); exit 1; }; } | |
| - ac_feature=`echo $ac_feature | sed 's/-/_/g'` | |
| - case $ac_option in | |
| - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | |
| - *) ac_optarg=yes ;; | |
| - esac | |
| - eval "enable_$ac_feature='$ac_optarg'" ;; | |
| + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` | |
| + eval enable_$ac_feature=\$ac_optarg ;; | |
| -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | |
| | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ | |
| @@ -595,6 +1051,12 @@ | |
| -host=* | --host=* | --hos=* | --ho=*) | |
| host_alias=$ac_optarg ;; | |
| + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) | |
| + ac_prev=htmldir ;; | |
| + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ | |
| + | --ht=*) | |
| + htmldir=$ac_optarg ;; | |
| + | |
| -includedir | --includedir | --includedi | --included | --include \ | |
| | --includ | --inclu | --incl | --inc) | |
| ac_prev=includedir ;; | |
| @@ -619,13 +1081,16 @@ | |
| | --libexe=* | --libex=* | --libe=*) | |
| libexecdir=$ac_optarg ;; | |
| + -localedir | --localedir | --localedi | --localed | --locale) | |
| + ac_prev=localedir ;; | |
| + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) | |
| + localedir=$ac_optarg ;; | |
| + | |
| -localstatedir | --localstatedir | --localstatedi | --localstated \ | |
| - | --localstate | --localstat | --localsta | --localst \ | |
| - | --locals | --local | --loca | --loc | --lo) | |
| + | --localstate | --localstat | --localsta | --localst | --locals) | |
| ac_prev=localstatedir ;; | |
| -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | |
| - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | |
| - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) | |
| + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) | |
| localstatedir=$ac_optarg ;; | |
| -mandir | --mandir | --mandi | --mand | --man | --ma | --m) | |
| @@ -690,6 +1155,16 @@ | |
| | --progr-tra=* | --program-tr=* | --program-t=*) | |
| program_transform_name=$ac_optarg ;; | |
| + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) | |
| + ac_prev=pdfdir ;; | |
| + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) | |
| + pdfdir=$ac_optarg ;; | |
| + | |
| + -psdir | --psdir | --psdi | --psd | --ps) | |
| + ac_prev=psdir ;; | |
| + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) | |
| + psdir=$ac_optarg ;; | |
| + | |
| -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | |
| | -silent | --silent | --silen | --sile | --sil) | |
| silent=yes ;; | |
| @@ -742,24 +1217,20 @@ | |
| -with-* | --with-*) | |
| ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | |
| # Reject names that are not valid shell variable names. | |
| - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
| + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
| { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
| { (exit 1); exit 1; }; } | |
| - ac_package=`echo $ac_package| sed 's/-/_/g'` | |
| - case $ac_option in | |
| - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; | |
| - *) ac_optarg=yes ;; | |
| - esac | |
| - eval "with_$ac_package='$ac_optarg'" ;; | |
| + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
| + eval with_$ac_package=\$ac_optarg ;; | |
| -without-* | --without-*) | |
| ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` | |
| # Reject names that are not valid shell variable names. | |
| - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && | |
| + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && | |
| { echo "$as_me: error: invalid package name: $ac_package" >&2 | |
| { (exit 1); exit 1; }; } | |
| - ac_package=`echo $ac_package | sed 's/-/_/g'` | |
| - eval "with_$ac_package=no" ;; | |
| + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` | |
| + eval with_$ac_package=no ;; | |
| --x) | |
| # Obsolete; use --with-x. | |
| @@ -790,8 +1261,7 @@ | |
| expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && | |
| { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 | |
| { (exit 1); exit 1; }; } | |
| - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` | |
| - eval "$ac_envvar='$ac_optarg'" | |
| + eval $ac_envvar=\$ac_optarg | |
| export $ac_envvar ;; | |
| *) | |
| @@ -811,27 +1281,19 @@ | |
| { (exit 1); exit 1; }; } | |
| fi | |
| -# Be sure to have absolute paths. | |
| -for ac_var in exec_prefix prefix | |
| -do | |
| - eval ac_val=$`echo $ac_var` | |
| - case $ac_val in | |
| - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; | |
| - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | |
| - { (exit 1); exit 1; }; };; | |
| - esac | |
| -done | |
| - | |
| -# Be sure to have absolute paths. | |
| -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ | |
| - localstatedir libdir includedir oldincludedir infodir mandir | |
| +# Be sure to have absolute directory names. | |
| +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | |
| + datadir sysconfdir sharedstatedir localstatedir includedir \ | |
| + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | |
| + libdir localedir mandir | |
| do | |
| - eval ac_val=$`echo $ac_var` | |
| + eval ac_val=\$$ac_var | |
| case $ac_val in | |
| - [\\/$]* | ?:[\\/]* ) ;; | |
| - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | |
| - { (exit 1); exit 1; }; };; | |
| + [\\/$]* | ?:[\\/]* ) continue;; | |
| + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | |
| esac | |
| + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 | |
| + { (exit 1); exit 1; }; } | |
| done | |
| # There might be people who depend on the old broken behavior: `$host' | |
| @@ -858,94 +1320,76 @@ | |
| test "$silent" = yes && exec 6>/dev/null | |
| -# Find the source files, if location was not specified. | |
| -if test -z "$srcdir"; then | |
| +ac_pwd=`pwd` && test -n "$ac_pwd" && | |
| +ac_ls_di=`ls -di .` && | |
| +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | |
| + { echo "$as_me: error: Working directory cannot be determined" >&2 | |
| + { (exit 1); exit 1; }; } | |
| +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | |
| + { echo "$as_me: error: pwd does not report name of working directory" >&2 | |
| + { (exit 1); exit 1; }; } | |
| + | |
| + | |
| +# Find the source files, if location was not specified. | |
| +if test -z "$srcdir"; then | |
| ac_srcdir_defaulted=yes | |
| - # Try the directory containing this script, then its parent. | |
| - ac_confdir=`(dirname "$0") 2>/dev/null || | |
| + # Try the directory containing this script, then the parent directory. | |
| + ac_confdir=`$as_dirname -- "$0" || | |
| $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| X"$0" : 'X\(//\)[^/]' \| \ | |
| X"$0" : 'X\(//\)$' \| \ | |
| - X"$0" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$0" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X"$0" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)[^/].*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| srcdir=$ac_confdir | |
| - if test ! -r $srcdir/$ac_unique_file; then | |
| + if test ! -r "$srcdir/$ac_unique_file"; then | |
| srcdir=.. | |
| fi | |
| else | |
| ac_srcdir_defaulted=no | |
| fi | |
| -if test ! -r $srcdir/$ac_unique_file; then | |
| - if test "$ac_srcdir_defaulted" = yes; then | |
| - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 | |
| - { (exit 1); exit 1; }; } | |
| - else | |
| - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | |
| +if test ! -r "$srcdir/$ac_unique_file"; then | |
| + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | |
| + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 | |
| { (exit 1); exit 1; }; } | |
| - fi | |
| fi | |
| -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || | |
| - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 | |
| +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | |
| +ac_abs_confdir=`( | |
| + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 | |
| { (exit 1); exit 1; }; } | |
| -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` | |
| -ac_env_build_alias_set=${build_alias+set} | |
| -ac_env_build_alias_value=$build_alias | |
| -ac_cv_env_build_alias_set=${build_alias+set} | |
| -ac_cv_env_build_alias_value=$build_alias | |
| -ac_env_host_alias_set=${host_alias+set} | |
| -ac_env_host_alias_value=$host_alias | |
| -ac_cv_env_host_alias_set=${host_alias+set} | |
| -ac_cv_env_host_alias_value=$host_alias | |
| -ac_env_target_alias_set=${target_alias+set} | |
| -ac_env_target_alias_value=$target_alias | |
| -ac_cv_env_target_alias_set=${target_alias+set} | |
| -ac_cv_env_target_alias_value=$target_alias | |
| -ac_env_CC_set=${CC+set} | |
| -ac_env_CC_value=$CC | |
| -ac_cv_env_CC_set=${CC+set} | |
| -ac_cv_env_CC_value=$CC | |
| -ac_env_CFLAGS_set=${CFLAGS+set} | |
| -ac_env_CFLAGS_value=$CFLAGS | |
| -ac_cv_env_CFLAGS_set=${CFLAGS+set} | |
| -ac_cv_env_CFLAGS_value=$CFLAGS | |
| -ac_env_LDFLAGS_set=${LDFLAGS+set} | |
| -ac_env_LDFLAGS_value=$LDFLAGS | |
| -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} | |
| -ac_cv_env_LDFLAGS_value=$LDFLAGS | |
| -ac_env_CPPFLAGS_set=${CPPFLAGS+set} | |
| -ac_env_CPPFLAGS_value=$CPPFLAGS | |
| -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} | |
| -ac_cv_env_CPPFLAGS_value=$CPPFLAGS | |
| -ac_env_CPP_set=${CPP+set} | |
| -ac_env_CPP_value=$CPP | |
| -ac_cv_env_CPP_set=${CPP+set} | |
| -ac_cv_env_CPP_value=$CPP | |
| -ac_env_CXX_set=${CXX+set} | |
| -ac_env_CXX_value=$CXX | |
| -ac_cv_env_CXX_set=${CXX+set} | |
| -ac_cv_env_CXX_value=$CXX | |
| -ac_env_CXXFLAGS_set=${CXXFLAGS+set} | |
| -ac_env_CXXFLAGS_value=$CXXFLAGS | |
| -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} | |
| -ac_cv_env_CXXFLAGS_value=$CXXFLAGS | |
| -ac_env_CXXCPP_set=${CXXCPP+set} | |
| -ac_env_CXXCPP_value=$CXXCPP | |
| -ac_cv_env_CXXCPP_set=${CXXCPP+set} | |
| -ac_cv_env_CXXCPP_value=$CXXCPP | |
| -ac_env_F77_set=${F77+set} | |
| -ac_env_F77_value=$F77 | |
| -ac_cv_env_F77_set=${F77+set} | |
| -ac_cv_env_F77_value=$F77 | |
| -ac_env_FFLAGS_set=${FFLAGS+set} | |
| -ac_env_FFLAGS_value=$FFLAGS | |
| -ac_cv_env_FFLAGS_set=${FFLAGS+set} | |
| -ac_cv_env_FFLAGS_value=$FFLAGS | |
| + pwd)` | |
| +# When building in place, set srcdir=. | |
| +if test "$ac_abs_confdir" = "$ac_pwd"; then | |
| + srcdir=. | |
| +fi | |
| +# Remove unnecessary trailing slashes from srcdir. | |
| +# Double slashes in file names in object file debugging info | |
| +# mess up M-x gdb in Emacs. | |
| +case $srcdir in | |
| +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; | |
| +esac | |
| +for ac_var in $ac_precious_vars; do | |
| + eval ac_env_${ac_var}_set=\${${ac_var}+set} | |
| + eval ac_env_${ac_var}_value=\$${ac_var} | |
| + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} | |
| + eval ac_cv_env_${ac_var}_value=\$${ac_var} | |
| +done | |
| # | |
| # Report the --help message. | |
| @@ -974,9 +1418,6 @@ | |
| -n, --no-create do not create output files | |
| --srcdir=DIR find the sources in DIR [configure dir or \`..'] | |
| -_ACEOF | |
| - | |
| - cat <<_ACEOF | |
| Installation directories: | |
| --prefix=PREFIX install architecture-independent files in PREFIX | |
| [$ac_default_prefix] | |
| @@ -994,15 +1435,22 @@ | |
| --bindir=DIR user executables [EPREFIX/bin] | |
| --sbindir=DIR system admin executables [EPREFIX/sbin] | |
| --libexecdir=DIR program executables [EPREFIX/libexec] | |
| - --datadir=DIR read-only architecture-independent data [PREFIX/share] | |
| --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | |
| --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | |
| --localstatedir=DIR modifiable single-machine data [PREFIX/var] | |
| --libdir=DIR object code libraries [EPREFIX/lib] | |
| --includedir=DIR C header files [PREFIX/include] | |
| --oldincludedir=DIR C header files for non-gcc [/usr/include] | |
| - --infodir=DIR info documentation [PREFIX/info] | |
| - --mandir=DIR man documentation [PREFIX/man] | |
| + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] | |
| + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] | |
| + --infodir=DIR info documentation [DATAROOTDIR/info] | |
| + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] | |
| + --mandir=DIR man documentation [DATAROOTDIR/man] | |
| + --docdir=DIR documentation root [DATAROOTDIR/doc/sysfsutils] | |
| + --htmldir=DIR html documentation [DOCDIR] | |
| + --dvidir=DIR dvi documentation [DOCDIR] | |
| + --pdfdir=DIR pdf documentation [DOCDIR] | |
| + --psdir=DIR ps documentation [DOCDIR] | |
| _ACEOF | |
| cat <<\_ACEOF | |
| @@ -1032,10 +1480,8 @@ | |
| absolute file name of klcc if not in the PATH | |
| --enable-klibc-layout Enable installing binaries, libraries and headers | |
| into the klibc prefix [yes] | |
| - --enable-shared[=PKGS] | |
| - build shared libraries [default=yes] | |
| - --enable-static[=PKGS] | |
| - build static libraries [default=yes] | |
| + --enable-shared[=PKGS] build shared libraries [default=yes] | |
| + --enable-static[=PKGS] build static libraries [default=yes] | |
| --enable-fast-install[=PKGS] | |
| optimize for fast installation [default=yes] | |
| --disable-dependency-tracking speeds up one-time build | |
| @@ -1048,16 +1494,16 @@ | |
| --with-gnu-ld assume the C compiler uses GNU ld [default=no] | |
| --with-pic try to use only PIC/non-PIC objects [default=use | |
| both] | |
| - --with-tags[=TAGS] | |
| - include additional configurations [automatic] | |
| + --with-tags[=TAGS] include additional configurations [automatic] | |
| Some influential environment variables: | |
| CC C compiler command | |
| CFLAGS C compiler flags | |
| LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a | |
| nonstandard directory <lib dir> | |
| - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have | |
| - headers in a nonstandard directory <include dir> | |
| + LIBS libraries to pass to the linker, e.g. -l<library> | |
| + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if | |
| + you have headers in a nonstandard directory <include dir> | |
| CPP C preprocessor | |
| CXX C++ compiler command | |
| CXXFLAGS C++ compiler flags | |
| @@ -1070,120 +1516,86 @@ | |
| Report bugs to <linux-diag-devel@lists.sourceforge.net>. | |
| _ACEOF | |
| +ac_status=$? | |
| fi | |
| if test "$ac_init_help" = "recursive"; then | |
| # If there are subdirs, report their specific --help. | |
| - ac_popdir=`pwd` | |
| for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue | |
| - test -d $ac_dir || continue | |
| + test -d "$ac_dir" || continue | |
| ac_builddir=. | |
| -if test "$ac_dir" != .; then | |
| +case "$ac_dir" in | |
| +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
| +*) | |
| ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | |
| - # A "../" for each directory in $ac_dir_suffix. | |
| - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | |
| -else | |
| - ac_dir_suffix= ac_top_builddir= | |
| -fi | |
| + # A ".." for each directory in $ac_dir_suffix. | |
| + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | |
| + case $ac_top_builddir_sub in | |
| + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
| + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | |
| + esac ;; | |
| +esac | |
| +ac_abs_top_builddir=$ac_pwd | |
| +ac_abs_builddir=$ac_pwd$ac_dir_suffix | |
| +# for backward compatibility: | |
| +ac_top_builddir=$ac_top_build_prefix | |
| case $srcdir in | |
| - .) # No --srcdir option. We are building in place. | |
| + .) # We are building in place. | |
| ac_srcdir=. | |
| - if test -z "$ac_top_builddir"; then | |
| - ac_top_srcdir=. | |
| - else | |
| - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | |
| - fi ;; | |
| - [\\/]* | ?:[\\/]* ) # Absolute path. | |
| + ac_top_srcdir=$ac_top_builddir_sub | |
| + ac_abs_top_srcdir=$ac_pwd ;; | |
| + [\\/]* | ?:[\\/]* ) # Absolute name. | |
| ac_srcdir=$srcdir$ac_dir_suffix; | |
| - ac_top_srcdir=$srcdir ;; | |
| - *) # Relative path. | |
| - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | |
| - ac_top_srcdir=$ac_top_builddir$srcdir ;; | |
| -esac | |
| - | |
| -# Do not use `cd foo && pwd` to compute absolute paths, because | |
| -# the directories may not exist. | |
| -case `pwd` in | |
| -.) ac_abs_builddir="$ac_dir";; | |
| -*) | |
| - case "$ac_dir" in | |
| - .) ac_abs_builddir=`pwd`;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | |
| - *) ac_abs_builddir=`pwd`/"$ac_dir";; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_top_builddir=${ac_top_builddir}.;; | |
| -*) | |
| - case ${ac_top_builddir}. in | |
| - .) ac_abs_top_builddir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | |
| - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_srcdir=$ac_srcdir;; | |
| -*) | |
| - case $ac_srcdir in | |
| - .) ac_abs_srcdir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | |
| - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_top_srcdir=$ac_top_srcdir;; | |
| -*) | |
| - case $ac_top_srcdir in | |
| - .) ac_abs_top_srcdir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | |
| - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | |
| - esac;; | |
| + ac_top_srcdir=$srcdir | |
| + ac_abs_top_srcdir=$srcdir ;; | |
| + *) # Relative name. | |
| + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix | |
| + ac_top_srcdir=$ac_top_build_prefix$srcdir | |
| + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; | |
| esac | |
| +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | |
| - cd $ac_dir | |
| - # Check for guested configure; otherwise get Cygnus style configure. | |
| - if test -f $ac_srcdir/configure.gnu; then | |
| - echo | |
| - $SHELL $ac_srcdir/configure.gnu --help=recursive | |
| - elif test -f $ac_srcdir/configure; then | |
| - echo | |
| - $SHELL $ac_srcdir/configure --help=recursive | |
| - elif test -f $ac_srcdir/configure.ac || | |
| - test -f $ac_srcdir/configure.in; then | |
| - echo | |
| - $ac_configure --help | |
| + cd "$ac_dir" || { ac_status=$?; continue; } | |
| + # Check for guested configure. | |
| + if test -f "$ac_srcdir/configure.gnu"; then | |
| + echo && | |
| + $SHELL "$ac_srcdir/configure.gnu" --help=recursive | |
| + elif test -f "$ac_srcdir/configure"; then | |
| + echo && | |
| + $SHELL "$ac_srcdir/configure" --help=recursive | |
| else | |
| echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 | |
| - fi | |
| - cd $ac_popdir | |
| + fi || ac_status=$? | |
| + cd "$ac_pwd" || { ac_status=$?; break; } | |
| done | |
| fi | |
| -test -n "$ac_init_help" && exit 0 | |
| +test -n "$ac_init_help" && exit $ac_status | |
| if $ac_init_version; then | |
| cat <<\_ACEOF | |
| sysfsutils configure 2.1.0 | |
| -generated by GNU Autoconf 2.59 | |
| +generated by GNU Autoconf 2.61 | |
| -Copyright (C) 2003 Free Software Foundation, Inc. | |
| +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
| +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
| This configure script is free software; the Free Software Foundation | |
| gives unlimited permission to copy, distribute and modify it. | |
| _ACEOF | |
| - exit 0 | |
| + exit | |
| fi | |
| -exec 5>config.log | |
| -cat >&5 <<_ACEOF | |
| +cat >config.log <<_ACEOF | |
| This file contains any messages produced by compilers while | |
| running configure, to aid debugging if configure makes a mistake. | |
| It was created by sysfsutils $as_me 2.1.0, which was | |
| -generated by GNU Autoconf 2.59. Invocation command line was | |
| +generated by GNU Autoconf 2.61. Invocation command line was | |
| $ $0 $@ | |
| _ACEOF | |
| +exec 5>>config.log | |
| { | |
| cat <<_ASUNAME | |
| ## --------- ## | |
| @@ -1202,7 +1614,7 @@ | |
| /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` | |
| /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` | |
| /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` | |
| -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` | |
| +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` | |
| /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` | |
| /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` | |
| /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` | |
| @@ -1216,6 +1628,7 @@ | |
| test -z "$as_dir" && as_dir=. | |
| echo "PATH: $as_dir" | |
| done | |
| +IFS=$as_save_IFS | |
| } >&5 | |
| @@ -1237,7 +1650,6 @@ | |
| ac_configure_args= | |
| ac_configure_args0= | |
| ac_configure_args1= | |
| -ac_sep= | |
| ac_must_keep_next=false | |
| for ac_pass in 1 2 | |
| do | |
| @@ -1248,7 +1660,7 @@ | |
| -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | |
| | -silent | --silent | --silen | --sile | --sil) | |
| continue ;; | |
| - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | |
| + *\'*) | |
| ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; | |
| esac | |
| case $ac_pass in | |
| @@ -1270,9 +1682,7 @@ | |
| -* ) ac_must_keep_next=true ;; | |
| esac | |
| fi | |
| - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" | |
| - # Get rid of the leading space. | |
| - ac_sep=" " | |
| + ac_configure_args="$ac_configure_args '$ac_arg'" | |
| ;; | |
| esac | |
| done | |
| @@ -1283,8 +1693,8 @@ | |
| # When interrupted or exit'd, cleanup temporary files, and complete | |
| # config.log. We remove comments because anyway the quotes in there | |
| # would cause problems or look ugly. | |
| -# WARNING: Be sure not to use single quotes in there, as some shells, | |
| -# such as our DU 5.0 friend, will then `close' the trap. | |
| +# WARNING: Use '\'' to represent an apostrophe within the trap. | |
| +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. | |
| trap 'exit_status=$? | |
| # Save into config.log some information that might help in debugging. | |
| { | |
| @@ -1297,20 +1707,34 @@ | |
| _ASBOX | |
| echo | |
| # The following way of writing the cache mishandles newlines in values, | |
| -{ | |
| +( | |
| + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do | |
| + eval ac_val=\$$ac_var | |
| + case $ac_val in #( | |
| + *${as_nl}*) | |
| + case $ac_var in #( | |
| + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | |
| +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | |
| + esac | |
| + case $ac_var in #( | |
| + _ | IFS | as_nl) ;; #( | |
| + *) $as_unset $ac_var ;; | |
| + esac ;; | |
| + esac | |
| + done | |
| (set) 2>&1 | | |
| - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in | |
| - *ac_space=\ *) | |
| + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( | |
| + *${as_nl}ac_space=\ *) | |
| sed -n \ | |
| - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; | |
| - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" | |
| - ;; | |
| + "s/'\''/'\''\\\\'\'''\''/g; | |
| + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" | |
| + ;; #( | |
| *) | |
| - sed -n \ | |
| - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | |
| + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" | |
| ;; | |
| - esac; | |
| -} | |
| + esac | | |
| + sort | |
| +) | |
| echo | |
| cat <<\_ASBOX | |
| @@ -1321,22 +1745,28 @@ | |
| echo | |
| for ac_var in $ac_subst_vars | |
| do | |
| - eval ac_val=$`echo $ac_var` | |
| - echo "$ac_var='"'"'$ac_val'"'"'" | |
| + eval ac_val=\$$ac_var | |
| + case $ac_val in | |
| + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | |
| + esac | |
| + echo "$ac_var='\''$ac_val'\''" | |
| done | sort | |
| echo | |
| if test -n "$ac_subst_files"; then | |
| cat <<\_ASBOX | |
| -## ------------- ## | |
| -## Output files. ## | |
| -## ------------- ## | |
| +## ------------------- ## | |
| +## File substitutions. ## | |
| +## ------------------- ## | |
| _ASBOX | |
| echo | |
| for ac_var in $ac_subst_files | |
| do | |
| - eval ac_val=$`echo $ac_var` | |
| - echo "$ac_var='"'"'$ac_val'"'"'" | |
| + eval ac_val=\$$ac_var | |
| + case $ac_val in | |
| + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; | |
| + esac | |
| + echo "$ac_var='\''$ac_val'\''" | |
| done | sort | |
| echo | |
| fi | |
| @@ -1348,26 +1778,24 @@ | |
| ## ----------- ## | |
| _ASBOX | |
| echo | |
| - sed "/^$/d" confdefs.h | sort | |
| + cat confdefs.h | |
| echo | |
| fi | |
| test "$ac_signal" != 0 && | |
| echo "$as_me: caught signal $ac_signal" | |
| echo "$as_me: exit $exit_status" | |
| } >&5 | |
| - rm -f core *.core && | |
| - rm -rf conftest* confdefs* conf$$* $ac_clean_files && | |
| + rm -f core *.core core.conftest.* && | |
| + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && | |
| exit $exit_status | |
| - ' 0 | |
| +' 0 | |
| for ac_signal in 1 2 13 15; do | |
| trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal | |
| done | |
| ac_signal=0 | |
| # confdefs.h avoids OS command line length limits that DEFS can exceed. | |
| -rm -rf conftest* confdefs.h | |
| -# AIX cpp loses on an empty file, so make sure it contains at least a newline. | |
| -echo >confdefs.h | |
| +rm -f -r conftest* confdefs.h | |
| # Predefined preprocessor variables. | |
| @@ -1398,14 +1826,17 @@ | |
| # Let the site file select an alternate cache file if it wants to. | |
| # Prefer explicitly selected file to automatically selected ones. | |
| -if test -z "$CONFIG_SITE"; then | |
| - if test "x$prefix" != xNONE; then | |
| - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" | |
| - else | |
| - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" | |
| - fi | |
| +if test -n "$CONFIG_SITE"; then | |
| + set x "$CONFIG_SITE" | |
| +elif test "x$prefix" != xNONE; then | |
| + set x "$prefix/share/config.site" "$prefix/etc/config.site" | |
| +else | |
| + set x "$ac_default_prefix/share/config.site" \ | |
| + "$ac_default_prefix/etc/config.site" | |
| fi | |
| -for ac_site_file in $CONFIG_SITE; do | |
| +shift | |
| +for ac_site_file | |
| +do | |
| if test -r "$ac_site_file"; then | |
| { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 | |
| echo "$as_me: loading site script $ac_site_file" >&6;} | |
| @@ -1421,8 +1852,8 @@ | |
| { echo "$as_me:$LINENO: loading cache $cache_file" >&5 | |
| echo "$as_me: loading cache $cache_file" >&6;} | |
| case $cache_file in | |
| - [\\/]* | ?:[\\/]* ) . $cache_file;; | |
| - *) . ./$cache_file;; | |
| + [\\/]* | ?:[\\/]* ) . "$cache_file";; | |
| + *) . "./$cache_file";; | |
| esac | |
| fi | |
| else | |
| @@ -1434,12 +1865,11 @@ | |
| # Check that the precious variables saved in the cache have kept the same | |
| # value. | |
| ac_cache_corrupted=false | |
| -for ac_var in `(set) 2>&1 | | |
| - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do | |
| +for ac_var in $ac_precious_vars; do | |
| eval ac_old_set=\$ac_cv_env_${ac_var}_set | |
| eval ac_new_set=\$ac_env_${ac_var}_set | |
| - eval ac_old_val="\$ac_cv_env_${ac_var}_value" | |
| - eval ac_new_val="\$ac_env_${ac_var}_value" | |
| + eval ac_old_val=\$ac_cv_env_${ac_var}_value | |
| + eval ac_new_val=\$ac_env_${ac_var}_value | |
| case $ac_old_set,$ac_new_set in | |
| set,) | |
| { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 | |
| @@ -1464,8 +1894,7 @@ | |
| # Pass precious variables to config.status. | |
| if test "$ac_new_set" = set; then | |
| case $ac_new_val in | |
| - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) | |
| - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | |
| + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; | |
| *) ac_arg=$ac_var=$ac_new_val ;; | |
| esac | |
| case " $ac_configure_args " in | |
| @@ -1482,11 +1911,6 @@ | |
| { (exit 1); exit 1; }; } | |
| fi | |
| -ac_ext=c | |
| -ac_cpp='$CPP $CPPFLAGS' | |
| -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| -ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| @@ -1511,34 +1935,45 @@ | |
| +ac_ext=c | |
| +ac_cpp='$CPP $CPPFLAGS' | |
| +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| +ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| +am__api_version='1.10' | |
| -am__api_version="1.9" | |
| ac_aux_dir= | |
| -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do | |
| - if test -f $ac_dir/install-sh; then | |
| +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | |
| + if test -f "$ac_dir/install-sh"; then | |
| ac_aux_dir=$ac_dir | |
| ac_install_sh="$ac_aux_dir/install-sh -c" | |
| break | |
| - elif test -f $ac_dir/install.sh; then | |
| + elif test -f "$ac_dir/install.sh"; then | |
| ac_aux_dir=$ac_dir | |
| ac_install_sh="$ac_aux_dir/install.sh -c" | |
| break | |
| - elif test -f $ac_dir/shtool; then | |
| + elif test -f "$ac_dir/shtool"; then | |
| ac_aux_dir=$ac_dir | |
| ac_install_sh="$ac_aux_dir/shtool install -c" | |
| break | |
| fi | |
| done | |
| if test -z "$ac_aux_dir"; then | |
| - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 | |
| -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} | |
| + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 | |
| +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} | |
| { (exit 1); exit 1; }; } | |
| fi | |
| -ac_config_guess="$SHELL $ac_aux_dir/config.guess" | |
| -ac_config_sub="$SHELL $ac_aux_dir/config.sub" | |
| -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. | |
| + | |
| +# These three variables are undocumented and unsupported, | |
| +# and are intended to be withdrawn in a future Autoconf release. | |
| +# They can cause serious problems if a builder's source tree is in a directory | |
| +# whose full name contains unusual characters. | |
| +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. | |
| +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. | |
| +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. | |
| + | |
| # Find a good install program. We prefer a C program (faster), | |
| # so one script is as good as another. But avoid the broken or | |
| @@ -1553,8 +1988,8 @@ | |
| # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | |
| # OS/2's system install, which has a completely different semantic | |
| # ./install, which can be erroneously created by make from ./install.sh. | |
| -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | |
| -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | |
| +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } | |
| if test -z "$INSTALL"; then | |
| if test "${ac_cv_path_install+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| @@ -1576,7 +2011,7 @@ | |
| # by default. | |
| for ac_prog in ginstall scoinst install; do | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
| if test $ac_prog = install && | |
| grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | |
| # AIX install. It has an incompatible calling convention. | |
| @@ -1595,21 +2030,22 @@ | |
| ;; | |
| esac | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| if test "${ac_cv_path_install+set}" = set; then | |
| INSTALL=$ac_cv_path_install | |
| else | |
| - # As a last resort, use the slow shell script. We don't cache a | |
| - # path for INSTALL within a source directory, because that will | |
| + # As a last resort, use the slow shell script. Don't cache a | |
| + # value for INSTALL within a source directory, because that will | |
| # break other packages using the cache if that directory is | |
| - # removed, or if the path is relative. | |
| + # removed, or if the value is a relative name. | |
| INSTALL=$ac_install_sh | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $INSTALL" >&5 | |
| -echo "${ECHO_T}$INSTALL" >&6 | |
| +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 | |
| +echo "${ECHO_T}$INSTALL" >&6; } | |
| # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | |
| # It thinks the first close brace ends the variable substitution. | |
| @@ -1619,8 +2055,8 @@ | |
| test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | |
| -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 | |
| -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 | |
| +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } | |
| # Just in case | |
| sleep 1 | |
| echo timestamp > conftest.file | |
| @@ -1662,20 +2098,20 @@ | |
| Check your system clock" >&2;} | |
| { (exit 1); exit 1; }; } | |
| fi | |
| -echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| +{ echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| test "$program_prefix" != NONE && | |
| - program_transform_name="s,^,$program_prefix,;$program_transform_name" | |
| + program_transform_name="s&^&$program_prefix&;$program_transform_name" | |
| # Use a double $ so make ignores it. | |
| test "$program_suffix" != NONE && | |
| - program_transform_name="s,\$,$program_suffix,;$program_transform_name" | |
| + program_transform_name="s&\$&$program_suffix&;$program_transform_name" | |
| # Double any \ or $. echo might interpret backslashes. | |
| # By default was `s,x,x', remove it if useless. | |
| cat <<\_ACEOF >conftest.sed | |
| s/[\\$]/&&/g;s/;s,x,x,$// | |
| _ACEOF | |
| program_transform_name=`echo $program_transform_name | sed -f conftest.sed` | |
| -rm conftest.sed | |
| +rm -f conftest.sed | |
| # expand $ac_aux_dir to an absolute path | |
| am_aux_dir=`cd $ac_aux_dir && pwd` | |
| @@ -1690,45 +2126,60 @@ | |
| echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} | |
| fi | |
| -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then | |
| - # We used to keeping the `.' as first argument, in order to | |
| - # allow $(mkdir_p) to be used without argument. As in | |
| - # $(mkdir_p) $(somedir) | |
| - # where $(somedir) is conditionally defined. However this is wrong | |
| - # for two reasons: | |
| - # 1. if the package is installed by a user who cannot write `.' | |
| - # make install will fail, | |
| - # 2. the above comment should most certainly read | |
| - # $(mkdir_p) $(DESTDIR)$(somedir) | |
| - # so it does not work when $(somedir) is undefined and | |
| - # $(DESTDIR) is not. | |
| - # To support the latter case, we have to write | |
| - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), | |
| - # so the `.' trick is pointless. | |
| - mkdir_p='mkdir -p --' | |
| -else | |
| - # On NextStep and OpenStep, the `mkdir' command does not | |
| - # recognize any option. It will interpret all options as | |
| - # directories to create, and then abort because `.' already | |
| - # exists. | |
| - for d in ./-p ./--version; | |
| - do | |
| - test -d $d && rmdir $d | |
| - done | |
| - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. | |
| - if test -f "$ac_aux_dir/mkinstalldirs"; then | |
| - mkdir_p='$(mkinstalldirs)' | |
| +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 | |
| +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } | |
| +if test -z "$MKDIR_P"; then | |
| + if test "${ac_cv_path_mkdir+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + for ac_prog in mkdir gmkdir; do | |
| + for ac_exec_ext in '' $ac_executable_extensions; do | |
| + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue | |
| + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( | |
| + 'mkdir (GNU coreutils) '* | \ | |
| + 'mkdir (coreutils) '* | \ | |
| + 'mkdir (fileutils) '4.1*) | |
| + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext | |
| + break 3;; | |
| + esac | |
| + done | |
| + done | |
| +done | |
| +IFS=$as_save_IFS | |
| + | |
| +fi | |
| + | |
| + if test "${ac_cv_path_mkdir+set}" = set; then | |
| + MKDIR_P="$ac_cv_path_mkdir -p" | |
| else | |
| - mkdir_p='$(install_sh) -d' | |
| + # As a last resort, use the slow shell script. Don't cache a | |
| + # value for MKDIR_P within a source directory, because that will | |
| + # break other packages using the cache if that directory is | |
| + # removed, or if the value is a relative name. | |
| + test -d ./--version && rmdir ./--version | |
| + MKDIR_P="$ac_install_sh -d" | |
| fi | |
| fi | |
| +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 | |
| +echo "${ECHO_T}$MKDIR_P" >&6; } | |
| + | |
| +mkdir_p="$MKDIR_P" | |
| +case $mkdir_p in | |
| + [\\/$]* | ?:[\\/]*) ;; | |
| + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; | |
| +esac | |
| for ac_prog in gawk mawk nawk awk | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_AWK+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -1741,54 +2192,57 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_AWK="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| AWK=$ac_cv_prog_AWK | |
| if test -n "$AWK"; then | |
| - echo "$as_me:$LINENO: result: $AWK" >&5 | |
| -echo "${ECHO_T}$AWK" >&6 | |
| + { echo "$as_me:$LINENO: result: $AWK" >&5 | |
| +echo "${ECHO_T}$AWK" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$AWK" && break | |
| done | |
| -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | |
| -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | |
| -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` | |
| -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | |
| +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } | |
| +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | |
| +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| cat >conftest.make <<\_ACEOF | |
| +SHELL = /bin/sh | |
| all: | |
| - @echo 'ac_maketemp="$(MAKE)"' | |
| + @echo '@@@%%%=$(MAKE)=@@@%%%' | |
| _ACEOF | |
| # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | |
| -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` | |
| -if test -n "$ac_maketemp"; then | |
| - eval ac_cv_prog_make_${ac_make}_set=yes | |
| -else | |
| - eval ac_cv_prog_make_${ac_make}_set=no | |
| -fi | |
| +case `${MAKE-make} -f conftest.make 2>/dev/null` in | |
| + *@@@%%%=?*=@@@%%%*) | |
| + eval ac_cv_prog_make_${ac_make}_set=yes;; | |
| + *) | |
| + eval ac_cv_prog_make_${ac_make}_set=no;; | |
| +esac | |
| rm -f conftest.make | |
| fi | |
| -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then | |
| - echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | |
| + { echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| SET_MAKE= | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| SET_MAKE="MAKE=${MAKE-make}" | |
| fi | |
| @@ -1801,12 +2255,16 @@ | |
| fi | |
| rmdir .tst 2>/dev/null | |
| -# test to see if srcdir already configured | |
| -if test "`cd $srcdir && pwd`" != "`pwd`" && | |
| - test -f $srcdir/config.status; then | |
| - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 | |
| +if test "`cd $srcdir && pwd`" != "`pwd`"; then | |
| + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output | |
| + # is not polluted with repeated "-I." | |
| + am__isrc=' -I$(srcdir)' | |
| + # test to see if srcdir already configured | |
| + if test -f $srcdir/config.status; then | |
| + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 | |
| echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} | |
| { (exit 1); exit 1; }; } | |
| + fi | |
| fi | |
| # test whether we have cygpath | |
| @@ -1849,7 +2307,7 @@ | |
| MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} | |
| -install_sh=${install_sh-"$am_aux_dir/install-sh"} | |
| +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} | |
| # Installed binaries are usually stripped using `strip' when the user | |
| # run `make install-strip'. However `strip' might not be the right | |
| @@ -1859,8 +2317,8 @@ | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}strip; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_STRIP+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -1873,32 +2331,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_STRIP="${ac_tool_prefix}strip" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| STRIP=$ac_cv_prog_STRIP | |
| if test -n "$STRIP"; then | |
| - echo "$as_me:$LINENO: result: $STRIP" >&5 | |
| -echo "${ECHO_T}$STRIP" >&6 | |
| + { echo "$as_me:$LINENO: result: $STRIP" >&5 | |
| +echo "${ECHO_T}$STRIP" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$ac_cv_prog_STRIP"; then | |
| ac_ct_STRIP=$STRIP | |
| # Extract the first word of "strip", so it can be a program name with args. | |
| set dummy strip; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -1911,33 +2371,47 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_STRIP="strip" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" | |
| fi | |
| fi | |
| ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | |
| if test -n "$ac_ct_STRIP"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | |
| -echo "${ECHO_T}$ac_ct_STRIP" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | |
| +echo "${ECHO_T}$ac_ct_STRIP" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - STRIP=$ac_ct_STRIP | |
| + if test "x$ac_ct_STRIP" = x; then | |
| + STRIP=":" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + STRIP=$ac_ct_STRIP | |
| + fi | |
| else | |
| STRIP="$ac_cv_prog_STRIP" | |
| fi | |
| fi | |
| -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" | |
| +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | |
| # We need awk for the "check" target. The system "awk" is bad on | |
| # some platforms. | |
| @@ -1952,77 +2426,106 @@ | |
| - ac_config_headers="$ac_config_headers config.h" | |
| +ac_config_headers="$ac_config_headers config.h" | |
| + | |
| # Checks for KLIBC support (should be before AC_PROG_LIBTOOL and AC_PROG_CC) | |
| # Make sure we can run config.sub. | |
| -$ac_config_sub sun4 >/dev/null 2>&1 || | |
| - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 | |
| -echo "$as_me: error: cannot run $ac_config_sub" >&2;} | |
| +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | |
| + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 | |
| +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} | |
| { (exit 1); exit 1; }; } | |
| -echo "$as_me:$LINENO: checking build system type" >&5 | |
| -echo $ECHO_N "checking build system type... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking build system type" >&5 | |
| +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } | |
| if test "${ac_cv_build+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - ac_cv_build_alias=$build_alias | |
| -test -z "$ac_cv_build_alias" && | |
| - ac_cv_build_alias=`$ac_config_guess` | |
| -test -z "$ac_cv_build_alias" && | |
| + ac_build_alias=$build_alias | |
| +test "x$ac_build_alias" = x && | |
| + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | |
| +test "x$ac_build_alias" = x && | |
| { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 | |
| echo "$as_me: error: cannot guess build type; you must specify one" >&2;} | |
| { (exit 1); exit 1; }; } | |
| -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || | |
| - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 | |
| -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} | |
| +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | |
| + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 | |
| +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} | |
| { (exit 1); exit 1; }; } | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | |
| -echo "${ECHO_T}$ac_cv_build" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 | |
| +echo "${ECHO_T}$ac_cv_build" >&6; } | |
| +case $ac_cv_build in | |
| +*-*-*) ;; | |
| +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 | |
| +echo "$as_me: error: invalid value of canonical build" >&2;} | |
| + { (exit 1); exit 1; }; };; | |
| +esac | |
| build=$ac_cv_build | |
| -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | |
| -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | |
| -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | |
| +ac_save_IFS=$IFS; IFS='-' | |
| +set x $ac_cv_build | |
| +shift | |
| +build_cpu=$1 | |
| +build_vendor=$2 | |
| +shift; shift | |
| +# Remember, the first character of IFS is used to create $*, | |
| +# except with old shells: | |
| +build_os=$* | |
| +IFS=$ac_save_IFS | |
| +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac | |
| -echo "$as_me:$LINENO: checking host system type" >&5 | |
| -echo $ECHO_N "checking host system type... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking host system type" >&5 | |
| +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } | |
| if test "${ac_cv_host+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - ac_cv_host_alias=$host_alias | |
| -test -z "$ac_cv_host_alias" && | |
| - ac_cv_host_alias=$ac_cv_build_alias | |
| -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || | |
| - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 | |
| -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} | |
| + if test "x$host_alias" = x; then | |
| + ac_cv_host=$ac_cv_build | |
| +else | |
| + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | |
| + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 | |
| +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} | |
| { (exit 1); exit 1; }; } | |
| +fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | |
| -echo "${ECHO_T}$ac_cv_host" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 | |
| +echo "${ECHO_T}$ac_cv_host" >&6; } | |
| +case $ac_cv_host in | |
| +*-*-*) ;; | |
| +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 | |
| +echo "$as_me: error: invalid value of canonical host" >&2;} | |
| + { (exit 1); exit 1; }; };; | |
| +esac | |
| host=$ac_cv_host | |
| -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` | |
| -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | |
| -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | |
| +ac_save_IFS=$IFS; IFS='-' | |
| +set x $ac_cv_host | |
| +shift | |
| +host_cpu=$1 | |
| +host_vendor=$2 | |
| +shift; shift | |
| +# Remember, the first character of IFS is used to create $*, | |
| +# except with old shells: | |
| +host_os=$* | |
| +IFS=$ac_save_IFS | |
| +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac | |
| -# Check whether --enable-klibc or --disable-klibc was given. | |
| +# Check whether --enable-klibc was given. | |
| if test "${enable_klibc+set}" = set; then | |
| - enableval="$enable_klibc" | |
| - KLIBC=$enableval | |
| + enableval=$enable_klibc; KLIBC=$enableval | |
| else | |
| KLIBC=no | |
| -fi; | |
| -# Check whether --enable-klibc-layout or --disable-klibc-layout was given. | |
| +fi | |
| + | |
| +# Check whether --enable-klibc-layout was given. | |
| if test "${enable_klibc_layout+set}" = set; then | |
| - enableval="$enable_klibc_layout" | |
| - if test "X$KLIBC" != Xno; then | |
| + enableval=$enable_klibc_layout; if test "X$KLIBC" != Xno; then | |
| KLIBC_LAYOUT=$enableval | |
| else | |
| KLIBC_LAYOUT=no | |
| @@ -2033,7 +2536,8 @@ | |
| else | |
| KLIBC_LAYOUT=no | |
| fi | |
| -fi; | |
| +fi | |
| + | |
| if test "X$KLIBC" != Xno; then | |
| # Basic cross compiling support. I do not think it is wise to use | |
| @@ -2044,8 +2548,8 @@ | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_KLCC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2058,25 +2562,27 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_KLCC="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| KLCC=$ac_cv_prog_KLCC | |
| if test -n "$KLCC"; then | |
| - echo "$as_me:$LINENO: result: $KLCC" >&5 | |
| -echo "${ECHO_T}$KLCC" >&6 | |
| + { echo "$as_me:$LINENO: result: $KLCC" >&5 | |
| +echo "${ECHO_T}$KLCC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$KLCC" && break | |
| done | |
| test -n "$KLCC" || KLCC="no" | |
| @@ -2086,8 +2592,8 @@ | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_KLCC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2100,25 +2606,27 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_KLCC="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| KLCC=$ac_cv_prog_KLCC | |
| if test -n "$KLCC"; then | |
| - echo "$as_me:$LINENO: result: $KLCC" >&5 | |
| -echo "${ECHO_T}$KLCC" >&6 | |
| + { echo "$as_me:$LINENO: result: $KLCC" >&5 | |
| +echo "${ECHO_T}$KLCC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$KLCC" && break | |
| done | |
| test -n "$KLCC" || KLCC="no" | |
| @@ -2170,9 +2678,7 @@ | |
| # These ones make KLIBC compiles very loud | |
| EXTRA_CFLAGS="-Wshadow -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs" | |
| fi | |
| - | |
| - | |
| -if test "X$KLIBC" == Xyes; then | |
| + if test "X$KLIBC" == Xyes; then | |
| KLIBC_TRUE= | |
| KLIBC_FALSE='#' | |
| else | |
| @@ -2183,10 +2689,9 @@ | |
| # Checks for LIBTOOL | |
| -# Check whether --enable-shared or --disable-shared was given. | |
| +# Check whether --enable-shared was given. | |
| if test "${enable_shared+set}" = set; then | |
| - enableval="$enable_shared" | |
| - p=${PACKAGE-default} | |
| + enableval=$enable_shared; p=${PACKAGE-default} | |
| case $enableval in | |
| yes) enable_shared=yes ;; | |
| no) enable_shared=no ;; | |
| @@ -2205,12 +2710,12 @@ | |
| esac | |
| else | |
| enable_shared=yes | |
| -fi; | |
| +fi | |
| -# Check whether --enable-static or --disable-static was given. | |
| + | |
| +# Check whether --enable-static was given. | |
| if test "${enable_static+set}" = set; then | |
| - enableval="$enable_static" | |
| - p=${PACKAGE-default} | |
| + enableval=$enable_static; p=${PACKAGE-default} | |
| case $enableval in | |
| yes) enable_static=yes ;; | |
| no) enable_static=no ;; | |
| @@ -2229,12 +2734,12 @@ | |
| esac | |
| else | |
| enable_static=yes | |
| -fi; | |
| +fi | |
| -# Check whether --enable-fast-install or --disable-fast-install was given. | |
| + | |
| +# Check whether --enable-fast-install was given. | |
| if test "${enable_fast_install+set}" = set; then | |
| - enableval="$enable_fast_install" | |
| - p=${PACKAGE-default} | |
| + enableval=$enable_fast_install; p=${PACKAGE-default} | |
| case $enableval in | |
| yes) enable_fast_install=yes ;; | |
| no) enable_fast_install=no ;; | |
| @@ -2253,11 +2758,12 @@ | |
| esac | |
| else | |
| enable_fast_install=yes | |
| -fi; | |
| +fi | |
| + | |
| DEPDIR="${am__leading_dot}deps" | |
| - ac_config_commands="$ac_config_commands depfiles" | |
| +ac_config_commands="$ac_config_commands depfiles" | |
| am_make=${MAKE-make} | |
| @@ -2267,8 +2773,8 @@ | |
| .PHONY: am__doit | |
| END | |
| # If we don't find an include directive, just comment out the code. | |
| -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 | |
| -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 | |
| +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } | |
| am__include="#" | |
| am__quote= | |
| _am_result=none | |
| @@ -2295,22 +2801,20 @@ | |
| fi | |
| -echo "$as_me:$LINENO: result: $_am_result" >&5 | |
| -echo "${ECHO_T}$_am_result" >&6 | |
| +{ echo "$as_me:$LINENO: result: $_am_result" >&5 | |
| +echo "${ECHO_T}$_am_result" >&6; } | |
| rm -f confinc confmf | |
| -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. | |
| +# Check whether --enable-dependency-tracking was given. | |
| if test "${enable_dependency_tracking+set}" = set; then | |
| - enableval="$enable_dependency_tracking" | |
| + enableval=$enable_dependency_tracking; | |
| +fi | |
| -fi; | |
| if test "x$enable_dependency_tracking" != xno; then | |
| am_depcomp="$ac_aux_dir/depcomp" | |
| AMDEPBACKSLASH='\' | |
| fi | |
| - | |
| - | |
| -if test "x$enable_dependency_tracking" != xno; then | |
| + if test "x$enable_dependency_tracking" != xno; then | |
| AMDEP_TRUE= | |
| AMDEP_FALSE='#' | |
| else | |
| @@ -2319,7 +2823,6 @@ | |
| fi | |
| - | |
| ac_ext=c | |
| ac_cpp='$CPP $CPPFLAGS' | |
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| @@ -2328,8 +2831,8 @@ | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}gcc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2342,32 +2845,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_CC="${ac_tool_prefix}gcc" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$ac_cv_prog_CC"; then | |
| ac_ct_CC=$CC | |
| # Extract the first word of "gcc", so it can be a program name with args. | |
| set dummy gcc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2380,36 +2885,51 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_CC="gcc" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
| if test -n "$ac_ct_CC"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| -echo "${ECHO_T}$ac_ct_CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| +echo "${ECHO_T}$ac_ct_CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - CC=$ac_ct_CC | |
| + if test "x$ac_ct_CC" = x; then | |
| + CC="" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + CC=$ac_ct_CC | |
| + fi | |
| else | |
| CC="$ac_cv_prog_CC" | |
| fi | |
| if test -z "$CC"; then | |
| - if test -n "$ac_tool_prefix"; then | |
| - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | |
| + if test -n "$ac_tool_prefix"; then | |
| + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}cc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2422,74 +2942,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_CC="${ac_tool_prefix}cc" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| -else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| -fi | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_CC"; then | |
| - ac_ct_CC=$CC | |
| - # Extract the first word of "cc", so it can be a program name with args. | |
| -set dummy cc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
| - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| -else | |
| - if test -n "$ac_ct_CC"; then | |
| - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| - ac_cv_prog_ac_ct_CC="cc" | |
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| -done | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
| -if test -n "$ac_ct_CC"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| -echo "${ECHO_T}$ac_ct_CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - CC=$ac_ct_CC | |
| -else | |
| - CC="$ac_cv_prog_CC" | |
| -fi | |
| + fi | |
| fi | |
| if test -z "$CC"; then | |
| # Extract the first word of "cc", so it can be a program name with args. | |
| set dummy cc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2503,7 +2983,7 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | |
| ac_prog_rejected=yes | |
| continue | |
| @@ -2514,6 +2994,7 @@ | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| if test $ac_prog_rejected = yes; then | |
| # We found a bogon in the path, so make sure we never use it. | |
| @@ -2531,22 +3012,23 @@ | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$CC"; then | |
| if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in cl | |
| + for ac_prog in cl.exe | |
| do | |
| # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2559,36 +3041,38 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$CC" && break | |
| done | |
| fi | |
| if test -z "$CC"; then | |
| ac_ct_CC=$CC | |
| - for ac_prog in cl | |
| + for ac_prog in cl.exe | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2601,29 +3085,45 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_CC="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
| if test -n "$ac_ct_CC"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| -echo "${ECHO_T}$ac_ct_CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| +echo "${ECHO_T}$ac_ct_CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$ac_ct_CC" && break | |
| done | |
| - CC=$ac_ct_CC | |
| + if test "x$ac_ct_CC" = x; then | |
| + CC="" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + CC=$ac_ct_CC | |
| + fi | |
| fi | |
| fi | |
| @@ -2636,21 +3136,35 @@ | |
| { (exit 1); exit 1; }; } | |
| # Provide some information about the compiler. | |
| -echo "$as_me:$LINENO:" \ | |
| - "checking for C compiler version" >&5 | |
| +echo "$as_me:$LINENO: checking for C compiler version" >&5 | |
| ac_compiler=`set X $ac_compile; echo $2` | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler --version </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler --version >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler --version >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -v </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -v >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -v >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -V </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -V >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -V >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| @@ -2675,47 +3189,77 @@ | |
| # Try to create an executable without -o first, disregard a.out. | |
| # It will help us diagnose broken compilers, and finding out an intuition | |
| # of exeext. | |
| -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | |
| -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 | |
| +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } | |
| ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 | |
| - (eval $ac_link_default) 2>&5 | |
| +# | |
| +# List of possible output files, starting from the most likely. | |
| +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) | |
| +# only as a last resort. b.out is created by i960 compilers. | |
| +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' | |
| +# | |
| +# The IRIX 6 linker writes into existing files which may not be | |
| +# executable, retaining their permissions. Remove them first so a | |
| +# subsequent execution test works. | |
| +ac_rmfiles= | |
| +for ac_file in $ac_files | |
| +do | |
| + case $ac_file in | |
| + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | |
| + * ) ac_rmfiles="$ac_rmfiles $ac_file";; | |
| + esac | |
| +done | |
| +rm -f $ac_rmfiles | |
| + | |
| +if { (ac_try="$ac_link_default" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link_default") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; then | |
| - # Find the output, starting from the most likely. This scheme is | |
| -# not robust to junk in `.', hence go to wildcards (a.*) only as a last | |
| -# resort. | |
| - | |
| -# Be careful to initialize this variable, since it used to be cached. | |
| -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. | |
| -ac_cv_exeext= | |
| -# b.out is created by i960 compilers. | |
| -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out | |
| + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. | |
| +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' | |
| +# in a Makefile. We should not override ac_cv_exeext if it was cached, | |
| +# so that the user can short-circuit this test for compilers unknown to | |
| +# Autoconf. | |
| +for ac_file in $ac_files '' | |
| do | |
| test -f "$ac_file" || continue | |
| case $ac_file in | |
| - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) | |
| - ;; | |
| - conftest.$ac_ext ) | |
| - # This is the source file. | |
| + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) | |
| ;; | |
| [ab].out ) | |
| # We found the default executable, but exeext='' is most | |
| # certainly right. | |
| break;; | |
| *.* ) | |
| - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | |
| - # FIXME: I believe we export ac_cv_exeext for Libtool, | |
| - # but it would be cool to find out if it's true. Does anybody | |
| - # maintain Libtool? --akim. | |
| - export ac_cv_exeext | |
| + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; | |
| + then :; else | |
| + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | |
| + fi | |
| + # We set ac_cv_exeext here because the later test for it is not | |
| + # safe: cross compilers may not add the suffix if given an `-o' | |
| + # argument, so we may need to know it at that point already. | |
| + # Even if this section looks crufty: it has the advantage of | |
| + # actually working. | |
| break;; | |
| * ) | |
| break;; | |
| esac | |
| done | |
| +test "$ac_cv_exeext" = no && ac_cv_exeext= | |
| + | |
| else | |
| + ac_file='' | |
| +fi | |
| + | |
| +{ echo "$as_me:$LINENO: result: $ac_file" >&5 | |
| +echo "${ECHO_T}$ac_file" >&6; } | |
| +if test -z "$ac_file"; then | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| @@ -2727,19 +3271,21 @@ | |
| fi | |
| ac_exeext=$ac_cv_exeext | |
| -echo "$as_me:$LINENO: result: $ac_file" >&5 | |
| -echo "${ECHO_T}$ac_file" >&6 | |
| -# Check the compiler produces executables we can run. If not, either | |
| +# Check that the compiler produces executables we can run. If not, either | |
| # the compiler is broken, or we cross compile. | |
| -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | |
| -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 | |
| +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } | |
| # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 | |
| # If not cross compiling, check that we can run a simple program. | |
| if test "$cross_compiling" != yes; then | |
| if { ac_try='./$ac_file' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + { (case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_try") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; }; then | |
| @@ -2758,22 +3304,27 @@ | |
| fi | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| +{ echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| rm -f a.out a.exe conftest$ac_cv_exeext b.out | |
| ac_clean_files=$ac_clean_files_save | |
| -# Check the compiler produces executables we can run. If not, either | |
| +# Check that the compiler produces executables we can run. If not, either | |
| # the compiler is broken, or we cross compile. | |
| -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | |
| -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 | |
| -echo "$as_me:$LINENO: result: $cross_compiling" >&5 | |
| -echo "${ECHO_T}$cross_compiling" >&6 | |
| - | |
| -echo "$as_me:$LINENO: checking for suffix of executables" >&5 | |
| -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>&5 | |
| +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 | |
| +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } | |
| +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 | |
| +echo "${ECHO_T}$cross_compiling" >&6; } | |
| + | |
| +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 | |
| +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; then | |
| @@ -2784,9 +3335,8 @@ | |
| for ac_file in conftest.exe conftest conftest.*; do | |
| test -f "$ac_file" || continue | |
| case $ac_file in | |
| - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; | |
| + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; | |
| *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | |
| - export ac_cv_exeext | |
| break;; | |
| * ) break;; | |
| esac | |
| @@ -2800,14 +3350,14 @@ | |
| fi | |
| rm -f conftest$ac_cv_exeext | |
| -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | |
| -echo "${ECHO_T}$ac_cv_exeext" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 | |
| +echo "${ECHO_T}$ac_cv_exeext" >&6; } | |
| rm -f conftest.$ac_ext | |
| EXEEXT=$ac_cv_exeext | |
| ac_exeext=$EXEEXT | |
| -echo "$as_me:$LINENO: checking for suffix of object files" >&5 | |
| -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 | |
| +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } | |
| if test "${ac_cv_objext+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2827,14 +3377,20 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.o conftest.obj | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>&5 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; then | |
| - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do | |
| + for ac_file in conftest.o conftest.obj conftest.*; do | |
| + test -f "$ac_file" || continue; | |
| case $ac_file in | |
| - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; | |
| + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; | |
| *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` | |
| break;; | |
| esac | |
| @@ -2852,12 +3408,12 @@ | |
| rm -f conftest.$ac_cv_objext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | |
| -echo "${ECHO_T}$ac_cv_objext" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 | |
| +echo "${ECHO_T}$ac_cv_objext" >&6; } | |
| OBJEXT=$ac_cv_objext | |
| ac_objext=$OBJEXT | |
| -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
| -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
| +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | |
| if test "${ac_cv_c_compiler_gnu+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -2880,50 +3436,49 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_compiler_gnu=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_compiler_gnu=no | |
| + ac_compiler_gnu=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| ac_cv_c_compiler_gnu=$ac_compiler_gnu | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
| -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
| +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | |
| GCC=`test $ac_compiler_gnu = yes && echo yes` | |
| ac_test_CFLAGS=${CFLAGS+set} | |
| ac_save_CFLAGS=$CFLAGS | |
| -CFLAGS="-g" | |
| -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
| -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
| +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_cc_g+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| + ac_save_c_werror_flag=$ac_c_werror_flag | |
| + ac_c_werror_flag=yes | |
| + ac_cv_prog_cc_g=no | |
| + CFLAGS="-g" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| cat confdefs.h >>conftest.$ac_ext | |
| @@ -2939,38 +3494,118 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + ac_cv_prog_cc_g=yes | |
| +else | |
| + echo "$as_me: failed program was:" >&5 | |
| +sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| + CFLAGS="" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| +/* confdefs.h. */ | |
| +_ACEOF | |
| +cat confdefs.h >>conftest.$ac_ext | |
| +cat >>conftest.$ac_ext <<_ACEOF | |
| +/* end confdefs.h. */ | |
| + | |
| +int | |
| +main () | |
| +{ | |
| + | |
| + ; | |
| + return 0; | |
| +} | |
| +_ACEOF | |
| +rm -f conftest.$ac_objext | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| + grep -v '^ *+' conftest.er1 >conftest.err | |
| + rm -f conftest.er1 | |
| + cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + : | |
| +else | |
| + echo "$as_me: failed program was:" >&5 | |
| +sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| + ac_c_werror_flag=$ac_save_c_werror_flag | |
| + CFLAGS="-g" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| +/* confdefs.h. */ | |
| +_ACEOF | |
| +cat confdefs.h >>conftest.$ac_ext | |
| +cat >>conftest.$ac_ext <<_ACEOF | |
| +/* end confdefs.h. */ | |
| + | |
| +int | |
| +main () | |
| +{ | |
| + | |
| + ; | |
| + return 0; | |
| +} | |
| +_ACEOF | |
| +rm -f conftest.$ac_objext | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| + grep -v '^ *+' conftest.er1 >conftest.err | |
| + rm -f conftest.er1 | |
| + cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_prog_cc_g=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_prog_cc_g=no | |
| + | |
| +fi | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| +fi | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + ac_c_werror_flag=$ac_save_c_werror_flag | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
| -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
| +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | |
| if test "$ac_test_CFLAGS" = set; then | |
| CFLAGS=$ac_save_CFLAGS | |
| elif test $ac_cv_prog_cc_g = yes; then | |
| @@ -2986,12 +3621,12 @@ | |
| CFLAGS= | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 | |
| -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | |
| -if test "${ac_cv_prog_cc_stdc+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | |
| +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | |
| +if test "${ac_cv_prog_cc_c89+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - ac_cv_prog_cc_stdc=no | |
| + ac_cv_prog_cc_c89=no | |
| ac_save_CC=$CC | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| @@ -3025,12 +3660,17 @@ | |
| /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | |
| function prototypes and stuff, but not '\xHH' hex character constants. | |
| These don't provoke an error unfortunately, instead are silently treated | |
| - as 'x'. The following induces an error, until -std1 is added to get | |
| + as 'x'. The following induces an error, until -std is added to get | |
| proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | |
| array size at least. It's necessary to write '\x00'==0 to get something | |
| - that's true only with -std1. */ | |
| + that's true only with -std. */ | |
| int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | |
| +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters | |
| + inside strings and character constants. */ | |
| +#define FOO(x) 'x' | |
| +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; | |
| + | |
| int test (int i, double x); | |
| struct s1 {int (*f) (int a);}; | |
| struct s2 {int (*f) (double a);}; | |
| @@ -3045,205 +3685,57 @@ | |
| return 0; | |
| } | |
| _ACEOF | |
| -# Don't try gcc -ansi; that turns off useful extensions and | |
| -# breaks some systems' header files. | |
| -# AIX -qlanglvl=ansi | |
| -# Ultrix and OSF/1 -std1 | |
| -# HP-UX 10.20 and later -Ae | |
| -# HP-UX older versions -Aa -D_HPUX_SOURCE | |
| -# SVR4 -Xc -D__EXTENSIONS__ | |
| -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | |
| +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ | |
| + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | |
| do | |
| CC="$ac_save_CC $ac_arg" | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - ac_cv_prog_cc_stdc=$ac_arg | |
| -break | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + ac_cv_prog_cc_c89=$ac_arg | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext | |
| + test "x$ac_cv_prog_cc_c89" != "xno" && break | |
| done | |
| -rm -f conftest.$ac_ext conftest.$ac_objext | |
| +rm -f conftest.$ac_ext | |
| CC=$ac_save_CC | |
| fi | |
| - | |
| -case "x$ac_cv_prog_cc_stdc" in | |
| - x|xno) | |
| - echo "$as_me:$LINENO: result: none needed" >&5 | |
| -echo "${ECHO_T}none needed" >&6 ;; | |
| +# AC_CACHE_VAL | |
| +case "x$ac_cv_prog_cc_c89" in | |
| + x) | |
| + { echo "$as_me:$LINENO: result: none needed" >&5 | |
| +echo "${ECHO_T}none needed" >&6; } ;; | |
| + xno) | |
| + { echo "$as_me:$LINENO: result: unsupported" >&5 | |
| +echo "${ECHO_T}unsupported" >&6; } ;; | |
| *) | |
| - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 | |
| -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | |
| - CC="$CC $ac_cv_prog_cc_stdc" ;; | |
| + CC="$CC $ac_cv_prog_cc_c89" | |
| + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | |
| +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | |
| esac | |
| -# Some people use a C++ compiler to compile C. Since we use `exit', | |
| -# in C++ we need to declare it. In case someone uses the same compiler | |
| -# for both compiling C and C++ we need to have the C++ compiler decide | |
| -# the declaration of exit, since it's the most demanding environment. | |
| -cat >conftest.$ac_ext <<_ACEOF | |
| -#ifndef __cplusplus | |
| - choke me | |
| -#endif | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - for ac_declaration in \ | |
| - '' \ | |
| - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | |
| - 'extern "C" void std::exit (int); using std::exit;' \ | |
| - 'extern "C" void exit (int) throw ();' \ | |
| - 'extern "C" void exit (int);' \ | |
| - 'void exit (int);' | |
| -do | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| -/* confdefs.h. */ | |
| -_ACEOF | |
| -cat confdefs.h >>conftest.$ac_ext | |
| -cat >>conftest.$ac_ext <<_ACEOF | |
| -/* end confdefs.h. */ | |
| -$ac_declaration | |
| -#include <stdlib.h> | |
| -int | |
| -main () | |
| -{ | |
| -exit (42); | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - : | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| - | |
| -continue | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| -/* confdefs.h. */ | |
| -_ACEOF | |
| -cat confdefs.h >>conftest.$ac_ext | |
| -cat >>conftest.$ac_ext <<_ACEOF | |
| -/* end confdefs.h. */ | |
| -$ac_declaration | |
| -int | |
| -main () | |
| -{ | |
| -exit (42); | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - break | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| - | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -done | |
| -rm -f conftest* | |
| -if test -n "$ac_declaration"; then | |
| - echo '#ifdef __cplusplus' >>confdefs.h | |
| - echo $ac_declaration >>confdefs.h | |
| - echo '#endif' >>confdefs.h | |
| -fi | |
| - | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| ac_ext=c | |
| ac_cpp='$CPP $CPPFLAGS' | |
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| @@ -3252,8 +3744,8 @@ | |
| depcc="$CC" am_compiler_list= | |
| -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | |
| -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | |
| +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | |
| if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -3317,6 +3809,7 @@ | |
| depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | |
| $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | |
| >/dev/null 2>conftest.err && | |
| + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | |
| ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | |
| @@ -3342,13 +3835,11 @@ | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | |
| -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 | |
| +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | |
| +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } | |
| CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type | |
| - | |
| - | |
| -if | |
| + if | |
| test "x$enable_dependency_tracking" != xno \ | |
| && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then | |
| am__fastdepCC_TRUE= | |
| @@ -3359,8 +3850,8 @@ | |
| fi | |
| -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 | |
| -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 | |
| +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } | |
| if test "${lt_cv_path_SED+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -3373,12 +3864,13 @@ | |
| test -z "$as_dir" && as_dir=. | |
| for lt_ac_prog in sed gsed; do | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then | |
| lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" | |
| fi | |
| done | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| lt_ac_max=0 | |
| lt_ac_count=0 | |
| # Add /usr/xpg4/bin/sed as it is typically found on Solaris | |
| @@ -3413,37 +3905,185 @@ | |
| fi | |
| SED=$lt_cv_path_SED | |
| -echo "$as_me:$LINENO: result: $SED" >&5 | |
| -echo "${ECHO_T}$SED" >&6 | |
| -echo "$as_me:$LINENO: checking for egrep" >&5 | |
| -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 | |
| -if test "${ac_cv_prog_egrep+set}" = set; then | |
| +{ echo "$as_me:$LINENO: result: $SED" >&5 | |
| +echo "${ECHO_T}$SED" >&6; } | |
| + | |
| +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 | |
| +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } | |
| +if test "${ac_cv_path_GREP+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + # Extract the first word of "grep ggrep" to use in msg output | |
| +if test -z "$GREP"; then | |
| +set dummy grep ggrep; ac_prog_name=$2 | |
| +if test "${ac_cv_path_GREP+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + ac_path_GREP_found=false | |
| +# Loop through the user's path and test for each of PROGNAME-LIST | |
| +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + for ac_prog in grep ggrep; do | |
| + for ac_exec_ext in '' $ac_executable_extensions; do | |
| + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" | |
| + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | |
| + # Check for GNU ac_path_GREP and select it if it is found. | |
| + # Check for GNU $ac_path_GREP | |
| +case `"$ac_path_GREP" --version 2>&1` in | |
| +*GNU*) | |
| + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; | |
| +*) | |
| + ac_count=0 | |
| + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | |
| + while : | |
| + do | |
| + cat "conftest.in" "conftest.in" >"conftest.tmp" | |
| + mv "conftest.tmp" "conftest.in" | |
| + cp "conftest.in" "conftest.nl" | |
| + echo 'GREP' >> "conftest.nl" | |
| + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break | |
| + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | |
| + ac_count=`expr $ac_count + 1` | |
| + if test $ac_count -gt ${ac_path_GREP_max-0}; then | |
| + # Best one so far, save it but keep looking for a better one | |
| + ac_cv_path_GREP="$ac_path_GREP" | |
| + ac_path_GREP_max=$ac_count | |
| + fi | |
| + # 10*(2^10) chars as input seems more than enough | |
| + test $ac_count -gt 10 && break | |
| + done | |
| + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | |
| +esac | |
| + | |
| + | |
| + $ac_path_GREP_found && break 3 | |
| + done | |
| +done | |
| + | |
| +done | |
| +IFS=$as_save_IFS | |
| + | |
| + | |
| +fi | |
| + | |
| +GREP="$ac_cv_path_GREP" | |
| +if test -z "$GREP"; then | |
| + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | |
| +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | |
| + { (exit 1); exit 1; }; } | |
| +fi | |
| + | |
| +else | |
| + ac_cv_path_GREP=$GREP | |
| +fi | |
| + | |
| + | |
| +fi | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 | |
| +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } | |
| + GREP="$ac_cv_path_GREP" | |
| + | |
| + | |
| +{ echo "$as_me:$LINENO: checking for egrep" >&5 | |
| +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } | |
| +if test "${ac_cv_path_EGREP+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 | |
| + then ac_cv_path_EGREP="$GREP -E" | |
| + else | |
| + # Extract the first word of "egrep" to use in msg output | |
| +if test -z "$EGREP"; then | |
| +set dummy egrep; ac_prog_name=$2 | |
| +if test "${ac_cv_path_EGREP+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 | |
| - then ac_cv_prog_egrep='grep -E' | |
| - else ac_cv_prog_egrep='egrep' | |
| + ac_path_EGREP_found=false | |
| +# Loop through the user's path and test for each of PROGNAME-LIST | |
| +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + for ac_prog in egrep; do | |
| + for ac_exec_ext in '' $ac_executable_extensions; do | |
| + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" | |
| + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | |
| + # Check for GNU ac_path_EGREP and select it if it is found. | |
| + # Check for GNU $ac_path_EGREP | |
| +case `"$ac_path_EGREP" --version 2>&1` in | |
| +*GNU*) | |
| + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; | |
| +*) | |
| + ac_count=0 | |
| + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" | |
| + while : | |
| + do | |
| + cat "conftest.in" "conftest.in" >"conftest.tmp" | |
| + mv "conftest.tmp" "conftest.in" | |
| + cp "conftest.in" "conftest.nl" | |
| + echo 'EGREP' >> "conftest.nl" | |
| + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break | |
| + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break | |
| + ac_count=`expr $ac_count + 1` | |
| + if test $ac_count -gt ${ac_path_EGREP_max-0}; then | |
| + # Best one so far, save it but keep looking for a better one | |
| + ac_cv_path_EGREP="$ac_path_EGREP" | |
| + ac_path_EGREP_max=$ac_count | |
| fi | |
| + # 10*(2^10) chars as input seems more than enough | |
| + test $ac_count -gt 10 && break | |
| + done | |
| + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; | |
| +esac | |
| + | |
| + | |
| + $ac_path_EGREP_found && break 3 | |
| + done | |
| +done | |
| + | |
| +done | |
| +IFS=$as_save_IFS | |
| + | |
| + | |
| +fi | |
| + | |
| +EGREP="$ac_cv_path_EGREP" | |
| +if test -z "$EGREP"; then | |
| + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 | |
| +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} | |
| + { (exit 1); exit 1; }; } | |
| +fi | |
| + | |
| +else | |
| + ac_cv_path_EGREP=$EGREP | |
| +fi | |
| + | |
| + | |
| + fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 | |
| -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 | |
| - EGREP=$ac_cv_prog_egrep | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 | |
| +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } | |
| + EGREP="$ac_cv_path_EGREP" | |
| -# Check whether --with-gnu-ld or --without-gnu-ld was given. | |
| +# Check whether --with-gnu-ld was given. | |
| if test "${with_gnu_ld+set}" = set; then | |
| - withval="$with_gnu_ld" | |
| - test "$withval" = no || with_gnu_ld=yes | |
| + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | |
| else | |
| with_gnu_ld=no | |
| -fi; | |
| +fi | |
| + | |
| ac_prog=ld | |
| if test "$GCC" = yes; then | |
| # Check if gcc -print-prog-name=ld gives a path. | |
| - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | |
| -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | |
| +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | |
| case $host in | |
| *-*-mingw*) | |
| # gcc leaves a trailing carriage return which upsets mingw | |
| @@ -3472,11 +4112,11 @@ | |
| ;; | |
| esac | |
| elif test "$with_gnu_ld" = yes; then | |
| - echo "$as_me:$LINENO: checking for GNU ld" >&5 | |
| -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for GNU ld" >&5 | |
| +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | |
| -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | |
| +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } | |
| fi | |
| if test "${lt_cv_path_LD+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| @@ -3509,17 +4149,17 @@ | |
| LD="$lt_cv_path_LD" | |
| if test -n "$LD"; then | |
| - echo "$as_me:$LINENO: result: $LD" >&5 | |
| -echo "${ECHO_T}$LD" >&6 | |
| + { echo "$as_me:$LINENO: result: $LD" >&5 | |
| +echo "${ECHO_T}$LD" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | |
| echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | |
| { (exit 1); exit 1; }; } | |
| -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | |
| -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | |
| +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_gnu_ld+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -3533,20 +4173,20 @@ | |
| ;; | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } | |
| with_gnu_ld=$lt_cv_prog_gnu_ld | |
| -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 | |
| -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 | |
| +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } | |
| if test "${lt_cv_ld_reload_flag+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| lt_cv_ld_reload_flag='-r' | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 | |
| -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 | |
| +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } | |
| reload_flag=$lt_cv_ld_reload_flag | |
| case $reload_flag in | |
| "" | " "*) ;; | |
| @@ -3563,8 +4203,8 @@ | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 | |
| -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 | |
| +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } | |
| if test "${lt_cv_path_NM+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -3612,23 +4252,23 @@ | |
| test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 | |
| -echo "${ECHO_T}$lt_cv_path_NM" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 | |
| +echo "${ECHO_T}$lt_cv_path_NM" >&6; } | |
| NM="$lt_cv_path_NM" | |
| -echo "$as_me:$LINENO: checking whether ln -s works" >&5 | |
| -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 | |
| +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } | |
| LN_S=$as_ln_s | |
| if test "$LN_S" = "ln -s"; then | |
| - echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| + { echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | |
| -echo "${ECHO_T}no, using $LN_S" >&6 | |
| + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | |
| +echo "${ECHO_T}no, using $LN_S" >&6; } | |
| fi | |
| -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 | |
| -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 | |
| +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } | |
| if test "${lt_cv_deplibs_check_method+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -3647,7 +4287,7 @@ | |
| # whether `pass_all' will *always* work, you probably want this one. | |
| case $host_os in | |
| -aix4* | aix5*) | |
| +aix[4-9]*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -3669,16 +4309,22 @@ | |
| mingw* | pw32*) | |
| # Base MSYS/MinGW do not provide the 'file' command needed by | |
| - # func_win32_libid shell function, so use a weaker test based on 'objdump'. | |
| - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| - lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| + # func_win32_libid shell function, so use a weaker test based on 'objdump', | |
| + # unless we find 'file', for example because we are cross-compiling. | |
| + if ( file / ) >/dev/null 2>&1; then | |
| + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' | |
| + lt_cv_file_magic_cmd='func_win32_libid' | |
| + else | |
| + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' | |
| + lt_cv_file_magic_cmd='$OBJDUMP -f' | |
| + fi | |
| ;; | |
| darwin* | rhapsody*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -freebsd* | kfreebsd*-gnu | dragonfly*) | |
| +freebsd* | dragonfly*) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
| case $host_cpu in | |
| i*86 ) | |
| @@ -3716,7 +4362,7 @@ | |
| esac | |
| ;; | |
| -interix3*) | |
| +interix[3-9]*) | |
| # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here | |
| lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' | |
| ;; | |
| @@ -3732,11 +4378,11 @@ | |
| ;; | |
| # This must be Linux ELF. | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| -netbsd*) | |
| +netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then | |
| lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' | |
| else | |
| @@ -3766,6 +4412,10 @@ | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| +rdos*) | |
| + lt_cv_deplibs_check_method=pass_all | |
| + ;; | |
| + | |
| solaris*) | |
| lt_cv_deplibs_check_method=pass_all | |
| ;; | |
| @@ -3803,8 +4453,8 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 | |
| -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 | |
| +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } | |
| file_magic_cmd=$lt_cv_file_magic_cmd | |
| deplibs_check_method=$lt_cv_deplibs_check_method | |
| test -z "$deplibs_check_method" && deplibs_check_method=unknown | |
| @@ -3822,11 +4472,11 @@ | |
| compiler=$CC | |
| -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. | |
| +# Check whether --enable-libtool-lock was given. | |
| if test "${enable_libtool_lock+set}" = set; then | |
| - enableval="$enable_libtool_lock" | |
| + enableval=$enable_libtool_lock; | |
| +fi | |
| -fi; | |
| test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | |
| # Some flags need to be propagated to the compiler or linker for good | |
| @@ -3853,7 +4503,7 @@ | |
| ;; | |
| *-*-irix6*) | |
| # Find out which ABI we are using. | |
| - echo '#line 3856 "configure"' > conftest.$ac_ext | |
| + echo '#line 4506 "configure"' > conftest.$ac_ext | |
| if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| (eval $ac_compile) 2>&5 | |
| ac_status=$? | |
| @@ -3888,7 +4538,8 @@ | |
| rm -rf conftest* | |
| ;; | |
| -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) | |
| +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | |
| +s390*-*linux*|sparc*-*linux*) | |
| # Find out which ABI we are using. | |
| echo 'int i;' > conftest.$ac_ext | |
| if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| @@ -3899,6 +4550,9 @@ | |
| case `/usr/bin/file conftest.o` in | |
| *32-bit*) | |
| case $host in | |
| + x86_64-*kfreebsd*-gnu) | |
| + LD="${LD-ld} -m elf_i386_fbsd" | |
| + ;; | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_i386" | |
| ;; | |
| @@ -3915,6 +4569,9 @@ | |
| ;; | |
| *64-bit*) | |
| case $host in | |
| + x86_64-*kfreebsd*-gnu) | |
| + LD="${LD-ld} -m elf_x86_64_fbsd" | |
| + ;; | |
| x86_64-*linux*) | |
| LD="${LD-ld} -m elf_x86_64" | |
| ;; | |
| @@ -3938,8 +4595,8 @@ | |
| # On SCO OpenServer 5, we need -belf to get full-featured binaries. | |
| SAVE_CFLAGS="$CFLAGS" | |
| CFLAGS="$CFLAGS -belf" | |
| - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 | |
| -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 | |
| +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } | |
| if test "${lt_cv_cc_needs_belf+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -3965,35 +4622,32 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| lt_cv_cc_needs_belf=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -lt_cv_cc_needs_belf=no | |
| + lt_cv_cc_needs_belf=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| ac_ext=c | |
| ac_cpp='$CPP $CPPFLAGS' | |
| @@ -4002,8 +4656,8 @@ | |
| ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 | |
| -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 | |
| +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } | |
| if test x"$lt_cv_cc_needs_belf" != x"yes"; then | |
| # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf | |
| CFLAGS="$SAVE_CFLAGS" | |
| @@ -4021,7 +4675,11 @@ | |
| *64-bit*) | |
| case $lt_cv_prog_gnu_ld in | |
| yes*) LD="${LD-ld} -m elf64_sparc" ;; | |
| - *) LD="${LD-ld} -64" ;; | |
| + *) | |
| + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then | |
| + LD="${LD-ld} -64" | |
| + fi | |
| + ;; | |
| esac | |
| ;; | |
| esac | |
| @@ -4040,8 +4698,8 @@ | |
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | |
| -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 | |
| +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } | |
| # On Suns, sometimes $CPP names a directory. | |
| if test -n "$CPP" && test -d "$CPP"; then | |
| CPP= | |
| @@ -4075,24 +4733,22 @@ | |
| #endif | |
| Syntax error | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_c_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| : | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| @@ -4101,9 +4757,10 @@ | |
| # Broken: fails on valid input. | |
| continue | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| - # OK, works on sane cases. Now check whether non-existent headers | |
| + # OK, works on sane cases. Now check whether nonexistent headers | |
| # can be detected and how. | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| @@ -4113,24 +4770,22 @@ | |
| /* end confdefs.h. */ | |
| #include <ac_nonexistent.h> | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_c_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| # Broken: success on invalid input. | |
| continue | |
| else | |
| @@ -4141,6 +4796,7 @@ | |
| ac_preproc_ok=: | |
| break | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| done | |
| @@ -4158,8 +4814,8 @@ | |
| else | |
| ac_cv_prog_CPP=$CPP | |
| fi | |
| -echo "$as_me:$LINENO: result: $CPP" >&5 | |
| -echo "${ECHO_T}$CPP" >&6 | |
| +{ echo "$as_me:$LINENO: result: $CPP" >&5 | |
| +echo "${ECHO_T}$CPP" >&6; } | |
| ac_preproc_ok=false | |
| for ac_c_preproc_warn_flag in '' yes | |
| do | |
| @@ -4182,24 +4838,22 @@ | |
| #endif | |
| Syntax error | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_c_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| : | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| @@ -4208,9 +4862,10 @@ | |
| # Broken: fails on valid input. | |
| continue | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| - # OK, works on sane cases. Now check whether non-existent headers | |
| + # OK, works on sane cases. Now check whether nonexistent headers | |
| # can be detected and how. | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| @@ -4220,24 +4875,22 @@ | |
| /* end confdefs.h. */ | |
| #include <ac_nonexistent.h> | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_c_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| # Broken: success on invalid input. | |
| continue | |
| else | |
| @@ -4248,6 +4901,7 @@ | |
| ac_preproc_ok=: | |
| break | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| done | |
| @@ -4270,8 +4924,8 @@ | |
| ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | |
| -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | |
| +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } | |
| if test "${ac_cv_header_stdc+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -4295,35 +4949,31 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_header_stdc=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_header_stdc=no | |
| + ac_cv_header_stdc=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| if test $ac_cv_header_stdc = yes; then | |
| # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | |
| @@ -4379,6 +5029,7 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| #include <ctype.h> | |
| +#include <stdlib.h> | |
| #if ((' ' & 0x0FF) == 0x020) | |
| # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
| # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | |
| @@ -4398,18 +5049,27 @@ | |
| for (i = 0; i < 256; i++) | |
| if (XOR (islower (i), ISLOWER (i)) | |
| || toupper (i) != TOUPPER (i)) | |
| - exit(2); | |
| - exit (0); | |
| + return 2; | |
| + return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>&5 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + { (case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_try") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; }; then | |
| @@ -4422,12 +5082,14 @@ | |
| ( exit $ac_status ) | |
| ac_cv_header_stdc=no | |
| fi | |
| -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| + | |
| + | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | |
| -echo "${ECHO_T}$ac_cv_header_stdc" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | |
| +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } | |
| if test $ac_cv_header_stdc = yes; then | |
| cat >>confdefs.h <<\_ACEOF | |
| @@ -4450,9 +5112,9 @@ | |
| inttypes.h stdint.h unistd.h | |
| do | |
| as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | |
| -echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| cat >conftest.$ac_ext <<_ACEOF | |
| @@ -4466,38 +5128,35 @@ | |
| #include <$ac_header> | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| eval "$as_ac_Header=yes" | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -eval "$as_ac_Header=no" | |
| + eval "$as_ac_Header=no" | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| if test `eval echo '${'$as_ac_Header'}'` = yes; then | |
| cat >>confdefs.h <<_ACEOF | |
| #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 | |
| @@ -4512,18 +5171,19 @@ | |
| for ac_header in dlfcn.h | |
| do | |
| as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| - echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| else | |
| # Is the header compilable? | |
| -echo "$as_me:$LINENO: checking $ac_header usability" >&5 | |
| -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | |
| +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -4534,41 +5194,37 @@ | |
| #include <$ac_header> | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_header_compiler=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_header_compiler=no | |
| + ac_header_compiler=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
| -echo "${ECHO_T}$ac_header_compiler" >&6 | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
| +echo "${ECHO_T}$ac_header_compiler" >&6; } | |
| # Is the header present? | |
| -echo "$as_me:$LINENO: checking $ac_header presence" >&5 | |
| -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | |
| +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -4577,24 +5233,22 @@ | |
| /* end confdefs.h. */ | |
| #include <$ac_header> | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_c_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| ac_header_preproc=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| @@ -4602,9 +5256,10 @@ | |
| ac_header_preproc=no | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
| -echo "${ECHO_T}$ac_header_preproc" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
| +echo "${ECHO_T}$ac_header_preproc" >&6; } | |
| # So? What about this header? | |
| case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | |
| @@ -4628,25 +5283,24 @@ | |
| echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | |
| { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | |
| echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | |
| - ( | |
| - cat <<\_ASBOX | |
| + ( cat <<\_ASBOX | |
| ## ----------------------------------------------------- ## | |
| ## Report this to linux-diag-devel@lists.sourceforge.net ## | |
| ## ----------------------------------------------------- ## | |
| _ASBOX | |
| - ) | | |
| - sed "s/^/$as_me: WARNING: /" >&2 | |
| + ) | sed "s/^/$as_me: WARNING: /" >&2 | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| eval "$as_ac_Header=\$ac_header_preproc" | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| fi | |
| if test `eval echo '${'$as_ac_Header'}'` = yes; then | |
| @@ -4658,18 +5312,22 @@ | |
| done | |
| -ac_ext=cc | |
| +ac_ext=cpp | |
| ac_cpp='$CXXCPP $CPPFLAGS' | |
| ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | |
| -if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC | |
| +if test -z "$CXX"; then | |
| + if test -n "$CCC"; then | |
| + CXX=$CCC | |
| + else | |
| + if test -n "$ac_tool_prefix"; then | |
| + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | |
| do | |
| # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CXX+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -4682,36 +5340,38 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| CXX=$ac_cv_prog_CXX | |
| if test -n "$CXX"; then | |
| - echo "$as_me:$LINENO: result: $CXX" >&5 | |
| -echo "${ECHO_T}$CXX" >&6 | |
| + { echo "$as_me:$LINENO: result: $CXX" >&5 | |
| +echo "${ECHO_T}$CXX" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$CXX" && break | |
| done | |
| fi | |
| if test -z "$CXX"; then | |
| ac_ct_CXX=$CXX | |
| - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC | |
| + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -4724,55 +5384,85 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_CXX="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| ac_ct_CXX=$ac_cv_prog_ac_ct_CXX | |
| if test -n "$ac_ct_CXX"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 | |
| -echo "${ECHO_T}$ac_ct_CXX" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 | |
| +echo "${ECHO_T}$ac_ct_CXX" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$ac_ct_CXX" && break | |
| done | |
| -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" | |
| - CXX=$ac_ct_CXX | |
| + if test "x$ac_ct_CXX" = x; then | |
| + CXX="g++" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + CXX=$ac_ct_CXX | |
| + fi | |
| fi | |
| - | |
| + fi | |
| +fi | |
| # Provide some information about the compiler. | |
| -echo "$as_me:$LINENO:" \ | |
| - "checking for C++ compiler version" >&5 | |
| +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 | |
| ac_compiler=`set X $ac_compile; echo $2` | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler --version </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler --version >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler --version >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -v </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -v >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -v >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -V </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -V >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -V >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 | |
| -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 | |
| +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } | |
| if test "${ac_cv_cxx_compiler_gnu+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -4795,50 +5485,49 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_cxx_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_compiler_gnu=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_compiler_gnu=no | |
| + ac_compiler_gnu=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| ac_cv_cxx_compiler_gnu=$ac_compiler_gnu | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 | |
| -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 | |
| +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } | |
| GXX=`test $ac_compiler_gnu = yes && echo yes` | |
| ac_test_CXXFLAGS=${CXXFLAGS+set} | |
| ac_save_CXXFLAGS=$CXXFLAGS | |
| -CXXFLAGS="-g" | |
| -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 | |
| -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 | |
| +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_cxx_g+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| + ac_save_cxx_werror_flag=$ac_cxx_werror_flag | |
| + ac_cxx_werror_flag=yes | |
| + ac_cv_prog_cxx_g=no | |
| + CXXFLAGS="-g" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| cat confdefs.h >>conftest.$ac_ext | |
| @@ -4854,160 +5543,134 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_cxx_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_prog_cxx_g=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_prog_cxx_g=no | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | |
| -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 | |
| -if test "$ac_test_CXXFLAGS" = set; then | |
| - CXXFLAGS=$ac_save_CXXFLAGS | |
| -elif test $ac_cv_prog_cxx_g = yes; then | |
| - if test "$GXX" = yes; then | |
| - CXXFLAGS="-g -O2" | |
| - else | |
| - CXXFLAGS="-g" | |
| - fi | |
| -else | |
| - if test "$GXX" = yes; then | |
| - CXXFLAGS="-O2" | |
| - else | |
| - CXXFLAGS= | |
| - fi | |
| -fi | |
| -for ac_declaration in \ | |
| - '' \ | |
| - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | |
| - 'extern "C" void std::exit (int); using std::exit;' \ | |
| - 'extern "C" void exit (int) throw ();' \ | |
| - 'extern "C" void exit (int);' \ | |
| - 'void exit (int);' | |
| -do | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| + CXXFLAGS="" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| cat confdefs.h >>conftest.$ac_ext | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -$ac_declaration | |
| -#include <stdlib.h> | |
| + | |
| int | |
| main () | |
| { | |
| -exit (42); | |
| + | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_cxx_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| : | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -continue | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| + ac_cxx_werror_flag=$ac_save_cxx_werror_flag | |
| + CXXFLAGS="-g" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| cat confdefs.h >>conftest.$ac_ext | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -$ac_declaration | |
| + | |
| int | |
| main () | |
| { | |
| -exit (42); | |
| + | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_cxx_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - break | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + ac_cv_prog_cxx_g=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -done | |
| -rm -f conftest* | |
| -if test -n "$ac_declaration"; then | |
| - echo '#ifdef __cplusplus' >>confdefs.h | |
| - echo $ac_declaration >>confdefs.h | |
| - echo '#endif' >>confdefs.h | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| +fi | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -ac_ext=cc | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + ac_cxx_werror_flag=$ac_save_cxx_werror_flag | |
| +fi | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 | |
| +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } | |
| +if test "$ac_test_CXXFLAGS" = set; then | |
| + CXXFLAGS=$ac_save_CXXFLAGS | |
| +elif test $ac_cv_prog_cxx_g = yes; then | |
| + if test "$GXX" = yes; then | |
| + CXXFLAGS="-g -O2" | |
| + else | |
| + CXXFLAGS="-g" | |
| + fi | |
| +else | |
| + if test "$GXX" = yes; then | |
| + CXXFLAGS="-O2" | |
| + else | |
| + CXXFLAGS= | |
| + fi | |
| +fi | |
| +ac_ext=cpp | |
| ac_cpp='$CXXCPP $CPPFLAGS' | |
| ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| @@ -5015,8 +5678,8 @@ | |
| depcc="$CXX" am_compiler_list= | |
| -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | |
| -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | |
| +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | |
| if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5080,6 +5743,7 @@ | |
| depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | |
| $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | |
| >/dev/null 2>conftest.err && | |
| + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | |
| ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | |
| @@ -5105,13 +5769,11 @@ | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 | |
| -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 | |
| +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 | |
| +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } | |
| CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type | |
| - | |
| - | |
| -if | |
| + if | |
| test "x$enable_dependency_tracking" != xno \ | |
| && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then | |
| am__fastdepCXX_TRUE= | |
| @@ -5127,13 +5789,13 @@ | |
| if test -n "$CXX" && ( test "X$CXX" != "Xno" && | |
| ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | |
| (test "X$CXX" != "Xg++"))) ; then | |
| - ac_ext=cc | |
| + ac_ext=cpp | |
| ac_cpp='$CXXCPP $CPPFLAGS' | |
| ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| ac_compiler_gnu=$ac_cv_cxx_compiler_gnu | |
| -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 | |
| -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 | |
| +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } | |
| if test -z "$CXXCPP"; then | |
| if test "${ac_cv_prog_CXXCPP+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| @@ -5163,24 +5825,22 @@ | |
| #endif | |
| Syntax error | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| : | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| @@ -5189,9 +5849,10 @@ | |
| # Broken: fails on valid input. | |
| continue | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| - # OK, works on sane cases. Now check whether non-existent headers | |
| + # OK, works on sane cases. Now check whether nonexistent headers | |
| # can be detected and how. | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| @@ -5201,24 +5862,22 @@ | |
| /* end confdefs.h. */ | |
| #include <ac_nonexistent.h> | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| # Broken: success on invalid input. | |
| continue | |
| else | |
| @@ -5229,6 +5888,7 @@ | |
| ac_preproc_ok=: | |
| break | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| done | |
| @@ -5246,8 +5906,8 @@ | |
| else | |
| ac_cv_prog_CXXCPP=$CXXCPP | |
| fi | |
| -echo "$as_me:$LINENO: result: $CXXCPP" >&5 | |
| -echo "${ECHO_T}$CXXCPP" >&6 | |
| +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 | |
| +echo "${ECHO_T}$CXXCPP" >&6; } | |
| ac_preproc_ok=false | |
| for ac_cxx_preproc_warn_flag in '' yes | |
| do | |
| @@ -5270,24 +5930,22 @@ | |
| #endif | |
| Syntax error | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| : | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| @@ -5296,9 +5954,10 @@ | |
| # Broken: fails on valid input. | |
| continue | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| - # OK, works on sane cases. Now check whether non-existent headers | |
| + # OK, works on sane cases. Now check whether nonexistent headers | |
| # can be detected and how. | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| @@ -5308,24 +5967,22 @@ | |
| /* end confdefs.h. */ | |
| #include <ac_nonexistent.h> | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_cxx_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| # Broken: success on invalid input. | |
| continue | |
| else | |
| @@ -5336,6 +5993,7 @@ | |
| ac_preproc_ok=: | |
| break | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| done | |
| @@ -5351,7 +6009,7 @@ | |
| { (exit 1); exit 1; }; } | |
| fi | |
| -ac_ext=cc | |
| +ac_ext=cpp | |
| ac_cpp='$CXXCPP $CPPFLAGS' | |
| ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| @@ -5365,12 +6023,12 @@ | |
| ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| ac_compiler_gnu=$ac_cv_f77_compiler_gnu | |
| if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran | |
| + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn | |
| do | |
| # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_F77+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5383,36 +6041,38 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_F77="$ac_tool_prefix$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| F77=$ac_cv_prog_F77 | |
| if test -n "$F77"; then | |
| - echo "$as_me:$LINENO: result: $F77" >&5 | |
| -echo "${ECHO_T}$F77" >&6 | |
| + { echo "$as_me:$LINENO: result: $F77" >&5 | |
| +echo "${ECHO_T}$F77" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$F77" && break | |
| done | |
| fi | |
| if test -z "$F77"; then | |
| ac_ct_F77=$F77 | |
| - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran | |
| + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_F77+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5425,48 +6085,78 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_F77="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| ac_ct_F77=$ac_cv_prog_ac_ct_F77 | |
| if test -n "$ac_ct_F77"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 | |
| -echo "${ECHO_T}$ac_ct_F77" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 | |
| +echo "${ECHO_T}$ac_ct_F77" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$ac_ct_F77" && break | |
| done | |
| - F77=$ac_ct_F77 | |
| + if test "x$ac_ct_F77" = x; then | |
| + F77="" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + F77=$ac_ct_F77 | |
| + fi | |
| fi | |
| # Provide some information about the compiler. | |
| -echo "$as_me:5455:" \ | |
| - "checking for Fortran 77 compiler version" >&5 | |
| +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 | |
| ac_compiler=`set X $ac_compile; echo $2` | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler --version </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler --version >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler --version >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -v </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -v >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -v >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -V </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -V >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -V >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| @@ -5476,8 +6166,8 @@ | |
| # input file. (Note that this only needs to work for GNU compilers.) | |
| ac_save_ext=$ac_ext | |
| ac_ext=F | |
| -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 | |
| -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 | |
| +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } | |
| if test "${ac_cv_f77_compiler_gnu+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5490,46 +6180,42 @@ | |
| end | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_f77_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_f77_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_compiler_gnu=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_compiler_gnu=no | |
| + ac_compiler_gnu=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| ac_cv_f77_compiler_gnu=$ac_compiler_gnu | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 | |
| -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 | |
| +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } | |
| ac_ext=$ac_save_ext | |
| ac_test_FFLAGS=${FFLAGS+set} | |
| ac_save_FFLAGS=$FFLAGS | |
| FFLAGS= | |
| -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 | |
| -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 | |
| +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_f77_g+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5540,39 +6226,35 @@ | |
| end | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_f77_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_f77_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_prog_f77_g=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_prog_f77_g=no | |
| + ac_cv_prog_f77_g=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 | |
| -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 | |
| +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } | |
| if test "$ac_test_FFLAGS" = set; then | |
| FFLAGS=$ac_save_FFLAGS | |
| elif test $ac_cv_prog_f77_g = yes; then | |
| @@ -5599,10 +6281,9 @@ | |
| # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! | |
| - | |
| # find the maximum length of command line arguments | |
| -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 | |
| -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 | |
| +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } | |
| if test "${lt_cv_sys_max_cmd_len+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5686,43 +6367,47 @@ | |
| fi | |
| ;; | |
| *) | |
| - # If test is not a shell built-in, we'll probably end up computing a | |
| - # maximum length that is only half of the actual maximum length, but | |
| - # we can't tell. | |
| - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} | |
| - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ | |
| + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` | |
| + if test -n "$lt_cv_sys_max_cmd_len"; then | |
| + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` | |
| + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` | |
| + else | |
| + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} | |
| + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ | |
| = "XX$teststring") >/dev/null 2>&1 && | |
| - new_result=`expr "X$teststring" : ".*" 2>&1` && | |
| - lt_cv_sys_max_cmd_len=$new_result && | |
| - test $i != 17 # 1/2 MB should be enough | |
| - do | |
| - i=`expr $i + 1` | |
| - teststring=$teststring$teststring | |
| - done | |
| - teststring= | |
| - # Add a significant safety factor because C++ compilers can tack on massive | |
| - # amounts of additional arguments before passing them to the linker. | |
| - # It appears as though 1/2 is a usable value. | |
| - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` | |
| + new_result=`expr "X$teststring" : ".*" 2>&1` && | |
| + lt_cv_sys_max_cmd_len=$new_result && | |
| + test $i != 17 # 1/2 MB should be enough | |
| + do | |
| + i=`expr $i + 1` | |
| + teststring=$teststring$teststring | |
| + done | |
| + teststring= | |
| + # Add a significant safety factor because C++ compilers can tack on massive | |
| + # amounts of additional arguments before passing them to the linker. | |
| + # It appears as though 1/2 is a usable value. | |
| + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` | |
| + fi | |
| ;; | |
| esac | |
| fi | |
| if test -n $lt_cv_sys_max_cmd_len ; then | |
| - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 | |
| -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 | |
| + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 | |
| +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: none" >&5 | |
| -echo "${ECHO_T}none" >&6 | |
| + { echo "$as_me:$LINENO: result: none" >&5 | |
| +echo "${ECHO_T}none" >&6; } | |
| fi | |
| + | |
| # Check for command to grab the raw symbol name followed by C symbol from nm. | |
| -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 | |
| -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 | |
| +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } | |
| if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5757,7 +6442,7 @@ | |
| lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
| lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" | |
| ;; | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| if test "$host_cpu" = ia64; then | |
| symcode='[ABCDGIRSTW]' | |
| lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" | |
| @@ -5910,7 +6595,7 @@ | |
| echo "$progname: failed program was:" >&5 | |
| cat conftest.$ac_ext >&5 | |
| fi | |
| - rm -f conftest* conftst* | |
| + rm -rf conftest* conftst* | |
| # Do not use the global_symbol_pipe unless it works. | |
| if test "$pipe_works" = yes; then | |
| @@ -5926,15 +6611,15 @@ | |
| lt_cv_sys_global_symbol_to_cdecl= | |
| fi | |
| if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then | |
| - echo "$as_me:$LINENO: result: failed" >&5 | |
| -echo "${ECHO_T}failed" >&6 | |
| + { echo "$as_me:$LINENO: result: failed" >&5 | |
| +echo "${ECHO_T}failed" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: ok" >&5 | |
| -echo "${ECHO_T}ok" >&6 | |
| + { echo "$as_me:$LINENO: result: ok" >&5 | |
| +echo "${ECHO_T}ok" >&6; } | |
| fi | |
| -echo "$as_me:$LINENO: checking for objdir" >&5 | |
| -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for objdir" >&5 | |
| +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } | |
| if test "${lt_cv_objdir+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -5948,8 +6633,8 @@ | |
| fi | |
| rmdir .libs 2>/dev/null | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 | |
| -echo "${ECHO_T}$lt_cv_objdir" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 | |
| +echo "${ECHO_T}$lt_cv_objdir" >&6; } | |
| objdir=$lt_cv_objdir | |
| @@ -6000,8 +6685,8 @@ | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}ar; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_AR+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6014,32 +6699,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_AR="${ac_tool_prefix}ar" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| AR=$ac_cv_prog_AR | |
| if test -n "$AR"; then | |
| - echo "$as_me:$LINENO: result: $AR" >&5 | |
| -echo "${ECHO_T}$AR" >&6 | |
| + { echo "$as_me:$LINENO: result: $AR" >&5 | |
| +echo "${ECHO_T}$AR" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$ac_cv_prog_AR"; then | |
| ac_ct_AR=$AR | |
| # Extract the first word of "ar", so it can be a program name with args. | |
| set dummy ar; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_AR+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6052,27 +6739,41 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_AR="ar" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" | |
| fi | |
| fi | |
| ac_ct_AR=$ac_cv_prog_ac_ct_AR | |
| if test -n "$ac_ct_AR"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | |
| -echo "${ECHO_T}$ac_ct_AR" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 | |
| +echo "${ECHO_T}$ac_ct_AR" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - AR=$ac_ct_AR | |
| + if test "x$ac_ct_AR" = x; then | |
| + AR="false" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + AR=$ac_ct_AR | |
| + fi | |
| else | |
| AR="$ac_cv_prog_AR" | |
| fi | |
| @@ -6080,8 +6781,8 @@ | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_RANLIB+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6094,32 +6795,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| RANLIB=$ac_cv_prog_RANLIB | |
| if test -n "$RANLIB"; then | |
| - echo "$as_me:$LINENO: result: $RANLIB" >&5 | |
| -echo "${ECHO_T}$RANLIB" >&6 | |
| + { echo "$as_me:$LINENO: result: $RANLIB" >&5 | |
| +echo "${ECHO_T}$RANLIB" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$ac_cv_prog_RANLIB"; then | |
| ac_ct_RANLIB=$RANLIB | |
| # Extract the first word of "ranlib", so it can be a program name with args. | |
| set dummy ranlib; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6132,27 +6835,41 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_RANLIB="ranlib" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" | |
| fi | |
| fi | |
| ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | |
| if test -n "$ac_ct_RANLIB"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | |
| -echo "${ECHO_T}$ac_ct_RANLIB" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | |
| +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - RANLIB=$ac_ct_RANLIB | |
| + if test "x$ac_ct_RANLIB" = x; then | |
| + RANLIB=":" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + RANLIB=$ac_ct_RANLIB | |
| + fi | |
| else | |
| RANLIB="$ac_cv_prog_RANLIB" | |
| fi | |
| @@ -6160,8 +6877,8 @@ | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}strip; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_STRIP+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6174,32 +6891,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_STRIP="${ac_tool_prefix}strip" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| STRIP=$ac_cv_prog_STRIP | |
| if test -n "$STRIP"; then | |
| - echo "$as_me:$LINENO: result: $STRIP" >&5 | |
| -echo "${ECHO_T}$STRIP" >&6 | |
| + { echo "$as_me:$LINENO: result: $STRIP" >&5 | |
| +echo "${ECHO_T}$STRIP" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$ac_cv_prog_STRIP"; then | |
| ac_ct_STRIP=$STRIP | |
| # Extract the first word of "strip", so it can be a program name with args. | |
| set dummy strip; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6212,27 +6931,41 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_STRIP="strip" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" | |
| fi | |
| fi | |
| ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP | |
| if test -n "$ac_ct_STRIP"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | |
| -echo "${ECHO_T}$ac_ct_STRIP" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 | |
| +echo "${ECHO_T}$ac_ct_STRIP" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - STRIP=$ac_ct_STRIP | |
| + if test "x$ac_ct_STRIP" = x; then | |
| + STRIP=":" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + STRIP=$ac_ct_STRIP | |
| + fi | |
| else | |
| STRIP="$ac_cv_prog_STRIP" | |
| fi | |
| @@ -6260,7 +6993,7 @@ | |
| test -z "$ac_objext" && ac_objext=o | |
| # Determine commands to create old-style static archives. | |
| -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' | |
| +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' | |
| old_postinstall_cmds='chmod 644 $oldlib' | |
| old_postuninstall_cmds= | |
| @@ -6291,8 +7024,8 @@ | |
| case $deplibs_check_method in | |
| file_magic*) | |
| if test "$file_magic_cmd" = '$MAGIC_CMD'; then | |
| - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 | |
| -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 | |
| +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } | |
| if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6344,17 +7077,17 @@ | |
| MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | |
| if test -n "$MAGIC_CMD"; then | |
| - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | |
| -echo "${ECHO_T}$MAGIC_CMD" >&6 | |
| + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | |
| +echo "${ECHO_T}$MAGIC_CMD" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| if test -z "$lt_cv_path_MAGIC_CMD"; then | |
| if test -n "$ac_tool_prefix"; then | |
| - echo "$as_me:$LINENO: checking for file" >&5 | |
| -echo $ECHO_N "checking for file... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for file" >&5 | |
| +echo $ECHO_N "checking for file... $ECHO_C" >&6; } | |
| if test "${lt_cv_path_MAGIC_CMD+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6406,11 +7139,11 @@ | |
| MAGIC_CMD="$lt_cv_path_MAGIC_CMD" | |
| if test -n "$MAGIC_CMD"; then | |
| - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | |
| -echo "${ECHO_T}$MAGIC_CMD" >&6 | |
| + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 | |
| +echo "${ECHO_T}$MAGIC_CMD" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| else | |
| @@ -6422,72 +7155,384 @@ | |
| ;; | |
| esac | |
| -enable_dlopen=no | |
| -enable_win32_dll=no | |
| - | |
| -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. | |
| -if test "${enable_libtool_lock+set}" = set; then | |
| - enableval="$enable_libtool_lock" | |
| - | |
| -fi; | |
| -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | |
| - | |
| -# Check whether --with-pic or --without-pic was given. | |
| -if test "${with_pic+set}" = set; then | |
| - withval="$with_pic" | |
| - pic_mode="$withval" | |
| + case $host_os in | |
| + rhapsody* | darwin*) | |
| + if test -n "$ac_tool_prefix"; then | |
| + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. | |
| +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - pic_mode=default | |
| -fi; | |
| -test -z "$pic_mode" && pic_mode=default | |
| - | |
| -# Use C for the default configuration in the libtool script | |
| -tagname= | |
| -lt_save_CC="$CC" | |
| -ac_ext=c | |
| -ac_cpp='$CPP $CPPFLAGS' | |
| -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| -ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| - | |
| + if test -n "$DSYMUTIL"; then | |
| + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. | |
| +else | |
| +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + for ac_exec_ext in '' $ac_executable_extensions; do | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" | |
| + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| + break 2 | |
| + fi | |
| +done | |
| +done | |
| +IFS=$as_save_IFS | |
| -# Source file extension for C test sources. | |
| -ac_ext=c | |
| +fi | |
| +fi | |
| +DSYMUTIL=$ac_cv_prog_DSYMUTIL | |
| +if test -n "$DSYMUTIL"; then | |
| + { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 | |
| +echo "${ECHO_T}$DSYMUTIL" >&6; } | |
| +else | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| +fi | |
| -# Object file extension for compiled C test sources. | |
| -objext=o | |
| -objext=$objext | |
| -# Code to be used in simple compile tests | |
| -lt_simple_compile_test_code="int some_variable = 0;\n" | |
| +fi | |
| +if test -z "$ac_cv_prog_DSYMUTIL"; then | |
| + ac_ct_DSYMUTIL=$DSYMUTIL | |
| + # Extract the first word of "dsymutil", so it can be a program name with args. | |
| +set dummy dsymutil; ac_word=$2 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + if test -n "$ac_ct_DSYMUTIL"; then | |
| + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. | |
| +else | |
| +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + for ac_exec_ext in '' $ac_executable_extensions; do | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" | |
| + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| + break 2 | |
| + fi | |
| +done | |
| +done | |
| +IFS=$as_save_IFS | |
| -# Code to be used in simple link tests | |
| -lt_simple_link_test_code='int main(){return(0);}\n' | |
| +fi | |
| +fi | |
| +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL | |
| +if test -n "$ac_ct_DSYMUTIL"; then | |
| + { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 | |
| +echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } | |
| +else | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| +fi | |
| + if test "x$ac_ct_DSYMUTIL" = x; then | |
| + DSYMUTIL=":" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + DSYMUTIL=$ac_ct_DSYMUTIL | |
| + fi | |
| +else | |
| + DSYMUTIL="$ac_cv_prog_DSYMUTIL" | |
| +fi | |
| -# If no C compiler was specified, use CC. | |
| -LTCC=${LTCC-"$CC"} | |
| + if test -n "$ac_tool_prefix"; then | |
| + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. | |
| +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| +if test "${ac_cv_prog_NMEDIT+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + if test -n "$NMEDIT"; then | |
| + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. | |
| +else | |
| +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + for ac_exec_ext in '' $ac_executable_extensions; do | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" | |
| + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| + break 2 | |
| + fi | |
| +done | |
| +done | |
| +IFS=$as_save_IFS | |
| -# If no C compiler flags were specified, use CFLAGS. | |
| -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} | |
| +fi | |
| +fi | |
| +NMEDIT=$ac_cv_prog_NMEDIT | |
| +if test -n "$NMEDIT"; then | |
| + { echo "$as_me:$LINENO: result: $NMEDIT" >&5 | |
| +echo "${ECHO_T}$NMEDIT" >&6; } | |
| +else | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| +fi | |
| -# Allow CC to be a program name with arguments. | |
| -compiler=$CC | |
| + | |
| +fi | |
| +if test -z "$ac_cv_prog_NMEDIT"; then | |
| + ac_ct_NMEDIT=$NMEDIT | |
| + # Extract the first word of "nmedit", so it can be a program name with args. | |
| +set dummy nmedit; ac_word=$2 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + if test -n "$ac_ct_NMEDIT"; then | |
| + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. | |
| +else | |
| +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + for ac_exec_ext in '' $ac_executable_extensions; do | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| + ac_cv_prog_ac_ct_NMEDIT="nmedit" | |
| + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| + break 2 | |
| + fi | |
| +done | |
| +done | |
| +IFS=$as_save_IFS | |
| + | |
| +fi | |
| +fi | |
| +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT | |
| +if test -n "$ac_ct_NMEDIT"; then | |
| + { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 | |
| +echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } | |
| +else | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| +fi | |
| + | |
| + if test "x$ac_ct_NMEDIT" = x; then | |
| + NMEDIT=":" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + NMEDIT=$ac_ct_NMEDIT | |
| + fi | |
| +else | |
| + NMEDIT="$ac_cv_prog_NMEDIT" | |
| +fi | |
| + | |
| + | |
| + { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 | |
| +echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } | |
| +if test "${lt_cv_apple_cc_single_mod+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_apple_cc_single_mod=no | |
| + if test -z "${LT_MULTI_MODULE}"; then | |
| + # By default we will add the -single_module flag. You can override | |
| + # by either setting the environment variable LT_MULTI_MODULE | |
| + # non-empty at configure time, or by adding -multi_module to the | |
| + # link flags. | |
| + echo "int foo(void){return 1;}" > conftest.c | |
| + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ | |
| + -dynamiclib ${wl}-single_module conftest.c | |
| + if test -f libconftest.dylib; then | |
| + lt_cv_apple_cc_single_mod=yes | |
| + rm -rf libconftest.dylib* | |
| + fi | |
| + rm conftest.c | |
| + fi | |
| +fi | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 | |
| +echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } | |
| + { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 | |
| +echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } | |
| +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_ld_exported_symbols_list=no | |
| + save_LDFLAGS=$LDFLAGS | |
| + echo "_main" > conftest.sym | |
| + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| +/* confdefs.h. */ | |
| +_ACEOF | |
| +cat confdefs.h >>conftest.$ac_ext | |
| +cat >>conftest.$ac_ext <<_ACEOF | |
| +/* end confdefs.h. */ | |
| + | |
| +int | |
| +main () | |
| +{ | |
| + | |
| + ; | |
| + return 0; | |
| +} | |
| +_ACEOF | |
| +rm -f conftest.$ac_objext conftest$ac_exeext | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| + ac_status=$? | |
| + grep -v '^ *+' conftest.er1 >conftest.err | |
| + rm -f conftest.er1 | |
| + cat conftest.err >&5 | |
| + echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + lt_cv_ld_exported_symbols_list=yes | |
| +else | |
| + echo "$as_me: failed program was:" >&5 | |
| +sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| + lt_cv_ld_exported_symbols_list=no | |
| +fi | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| + conftest$ac_exeext conftest.$ac_ext | |
| + LDFLAGS="$save_LDFLAGS" | |
| + | |
| +fi | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 | |
| +echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } | |
| + case $host_os in | |
| + rhapsody* | darwin1.[0123]) | |
| + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; | |
| + darwin1.*) | |
| + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | |
| + darwin*) | |
| + # if running on 10.5 or later, the deployment target defaults | |
| + # to the OS version, if on x86, and 10.4, the deployment | |
| + # target defaults to 10.4. Don't you love it? | |
| + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in | |
| + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) | |
| + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | |
| + 10.[012]*) | |
| + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; | |
| + 10.*) | |
| + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; | |
| + esac | |
| + ;; | |
| + esac | |
| + if test "$lt_cv_apple_cc_single_mod" = "yes"; then | |
| + _lt_dar_single_mod='$single_module' | |
| + fi | |
| + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then | |
| + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' | |
| + else | |
| + _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" | |
| + fi | |
| + if test "$DSYMUTIL" != ":"; then | |
| + _lt_dsymutil="~$DSYMUTIL \$lib || :" | |
| + else | |
| + _lt_dsymutil= | |
| + fi | |
| + ;; | |
| + esac | |
| + | |
| + | |
| +enable_dlopen=no | |
| +enable_win32_dll=no | |
| + | |
| +# Check whether --enable-libtool-lock was given. | |
| +if test "${enable_libtool_lock+set}" = set; then | |
| + enableval=$enable_libtool_lock; | |
| +fi | |
| + | |
| +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes | |
| + | |
| + | |
| +# Check whether --with-pic was given. | |
| +if test "${with_pic+set}" = set; then | |
| + withval=$with_pic; pic_mode="$withval" | |
| +else | |
| + pic_mode=default | |
| +fi | |
| + | |
| +test -z "$pic_mode" && pic_mode=default | |
| + | |
| +# Use C for the default configuration in the libtool script | |
| +tagname= | |
| +lt_save_CC="$CC" | |
| +ac_ext=c | |
| +ac_cpp='$CPP $CPPFLAGS' | |
| +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| +ac_compiler_gnu=$ac_cv_c_compiler_gnu | |
| + | |
| + | |
| +# Source file extension for C test sources. | |
| +ac_ext=c | |
| + | |
| +# Object file extension for compiled C test sources. | |
| +objext=o | |
| +objext=$objext | |
| + | |
| +# Code to be used in simple compile tests | |
| +lt_simple_compile_test_code="int some_variable = 0;" | |
| + | |
| +# Code to be used in simple link tests | |
| +lt_simple_link_test_code='int main(){return(0);}' | |
| + | |
| + | |
| +# If no C compiler was specified, use CC. | |
| +LTCC=${LTCC-"$CC"} | |
| + | |
| +# If no C compiler flags were specified, use CFLAGS. | |
| +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} | |
| + | |
| +# Allow CC to be a program name with arguments. | |
| +compiler=$CC | |
| # save warnings/boilerplate of simple test code | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_compiler_boilerplate=`cat conftest.err` | |
| $rm conftest* | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_link_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_link_test_code" >conftest.$ac_ext | |
| eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_linker_boilerplate=`cat conftest.err` | |
| -$rm conftest* | |
| +$rm -r conftest* | |
| @@ -6497,14 +7542,14 @@ | |
| lt_prog_compiler_no_builtin_flag=' -fno-builtin' | |
| -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| lt_cv_prog_compiler_rtti_exceptions=no | |
| ac_outfile=conftest.$ac_objext | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="-fno-rtti -fno-exceptions" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| # (2) before a word containing "conftest.", or (3) at the end. | |
| @@ -6515,11 +7560,11 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:6518: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:7563: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>conftest.err) | |
| ac_status=$? | |
| cat conftest.err >&5 | |
| - echo "$as_me:6522: \$? = $ac_status" >&5 | |
| + echo "$as_me:7567: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s "$ac_outfile"; then | |
| # The compiler can only warn and ignore the option if not recognized | |
| # So say no if there are warnings other than the usual output. | |
| @@ -6532,8 +7577,8 @@ | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } | |
| if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | |
| lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" | |
| @@ -6547,8 +7592,8 @@ | |
| lt_prog_compiler_pic= | |
| lt_prog_compiler_static= | |
| -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |
| if test "$GCC" = yes; then | |
| lt_prog_compiler_wl='-Wl,' | |
| @@ -6570,13 +7615,15 @@ | |
| lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' | |
| ;; | |
| - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| # PIC is the default for these OSes. | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| + # Although the cygwin gcc ignores -fPIC, still need this for old-style | |
| + # (--disable-auto-import) libraries | |
| lt_prog_compiler_pic='-DDLL_EXPORT' | |
| ;; | |
| @@ -6586,7 +7633,7 @@ | |
| lt_prog_compiler_pic='-fno-common' | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| # Interix 3.x gcc -fpic/-fPIC options generate broken code. | |
| # Instead, we relocate shared libraries at runtime. | |
| ;; | |
| @@ -6644,7 +7691,7 @@ | |
| esac | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| lt_prog_compiler_pic='-DDLL_EXPORT' | |
| @@ -6677,7 +7724,7 @@ | |
| lt_prog_compiler_static='-Bstatic' | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| icc* | ecc*) | |
| lt_prog_compiler_wl='-Wl,' | |
| @@ -6696,6 +7743,22 @@ | |
| # All Alpha code is PIC. | |
| lt_prog_compiler_static='-non_shared' | |
| ;; | |
| + *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C 5.9 | |
| + lt_prog_compiler_pic='-KPIC' | |
| + lt_prog_compiler_static='-Bstatic' | |
| + lt_prog_compiler_wl='-Wl,' | |
| + ;; | |
| + *Sun\ F*) | |
| + # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| + lt_prog_compiler_pic='-KPIC' | |
| + lt_prog_compiler_static='-Bstatic' | |
| + lt_prog_compiler_wl='' | |
| + ;; | |
| + esac | |
| + ;; | |
| esac | |
| ;; | |
| @@ -6705,6 +7768,10 @@ | |
| lt_prog_compiler_static='-non_shared' | |
| ;; | |
| + rdos*) | |
| + lt_prog_compiler_static='-non_shared' | |
| + ;; | |
| + | |
| solaris*) | |
| lt_prog_compiler_pic='-KPIC' | |
| lt_prog_compiler_static='-Bstatic' | |
| @@ -6757,22 +7824,22 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 | |
| +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| # | |
| if test -n "$lt_prog_compiler_pic"; then | |
| -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | |
| -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_pic_works+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 | |
| +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_pic_works=no | |
| + lt_cv_prog_compiler_pic_works=no | |
| ac_outfile=conftest.$ac_objext | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="$lt_prog_compiler_pic -DPIC" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| # (2) before a word containing "conftest.", or (3) at the end. | |
| @@ -6783,27 +7850,27 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:6786: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:7853: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>conftest.err) | |
| ac_status=$? | |
| cat conftest.err >&5 | |
| - echo "$as_me:6790: \$? = $ac_status" >&5 | |
| + echo "$as_me:7857: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s "$ac_outfile"; then | |
| # The compiler can only warn and ignore the option if not recognized | |
| # So say no if there are warnings other than the usual output. | |
| $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_pic_works=yes | |
| + lt_cv_prog_compiler_pic_works=yes | |
| fi | |
| fi | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } | |
| -if test x"$lt_prog_compiler_pic_works" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then | |
| case $lt_prog_compiler_pic in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; | |
| @@ -6828,15 +7895,15 @@ | |
| # Check to make sure the static flag actually works. | |
| # | |
| wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" | |
| -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_static_works+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_static_works+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_static_works=no | |
| + lt_cv_prog_compiler_static_works=no | |
| save_LDFLAGS="$LDFLAGS" | |
| LDFLAGS="$LDFLAGS $lt_tmp_static_flag" | |
| - printf "$lt_simple_link_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_link_test_code" > conftest.$ac_ext | |
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | |
| # The linker can only warn and ignore the option if not recognized | |
| # So say no if there are warnings | |
| @@ -6846,28 +7913,28 @@ | |
| $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_static_works=yes | |
| + lt_cv_prog_compiler_static_works=yes | |
| fi | |
| else | |
| - lt_prog_compiler_static_works=yes | |
| + lt_cv_prog_compiler_static_works=yes | |
| fi | |
| fi | |
| - $rm conftest* | |
| + $rm -r conftest* | |
| LDFLAGS="$save_LDFLAGS" | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } | |
| -if test x"$lt_prog_compiler_static_works" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_static_works" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static= | |
| fi | |
| -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_compiler_c_o+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -6876,7 +7943,7 @@ | |
| mkdir conftest | |
| cd conftest | |
| mkdir out | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="-o out/conftest2.$ac_objext" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| @@ -6887,11 +7954,11 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:6890: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:7957: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>out/conftest.err) | |
| ac_status=$? | |
| cat out/conftest.err >&5 | |
| - echo "$as_me:6894: \$? = $ac_status" >&5 | |
| + echo "$as_me:7961: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
| then | |
| # The compiler can only warn and ignore the option if not recognized | |
| @@ -6913,23 +7980,23 @@ | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } | |
| hard_links="nottested" | |
| if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then | |
| # do not overwrite the value of need_locks provided by the user | |
| - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | |
| hard_links=yes | |
| $rm conftest* | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| touch conftest.a | |
| ln conftest.a conftest.b 2>&5 || hard_links=no | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| - echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| -echo "${ECHO_T}$hard_links" >&6 | |
| + { echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| +echo "${ECHO_T}$hard_links" >&6; } | |
| if test "$hard_links" = no; then | |
| { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | |
| echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | |
| @@ -6939,8 +8006,8 @@ | |
| need_locks=no | |
| fi | |
| -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | |
| runpath_var= | |
| allow_undefined_flag= | |
| @@ -6971,12 +8038,13 @@ | |
| # it will be wrapped by ` (' and `)$', so one must not match beginning or | |
| # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', | |
| # as well as any symbol that contains `d'. | |
| - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" | |
| + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | |
| # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out | |
| # platforms (ab)use it in PIC code, but their linkers get confused if | |
| # the symbol is explicitly referenced. Since portable code cannot | |
| # rely on this symbol name, it's probably fine to never include it in | |
| # preloaded symbol tables. | |
| + # Exclude shared library initialization/finalization symbols. | |
| extract_expsyms_cmds= | |
| # Just being paranoid about ensuring that cc_basename is set. | |
| for cc_temp in $compiler""; do | |
| @@ -7035,7 +8103,7 @@ | |
| # See if GNU ld supports shared libraries. | |
| case $host_os in | |
| - aix3* | aix4* | aix5*) | |
| + aix[3-9]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| if test "$host_cpu" != ia64; then | |
| ld_shlibs=no | |
| @@ -7083,7 +8151,7 @@ | |
| allow_undefined_flag=unsupported | |
| always_export_symbols=no | |
| enable_shared_with_static_runtimes=yes | |
| - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' | |
| + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then | |
| archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | |
| @@ -7101,7 +8169,7 @@ | |
| fi | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| hardcode_direct=no | |
| hardcode_shlibpath_var=no | |
| hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | |
| @@ -7116,7 +8184,7 @@ | |
| archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | |
| ;; | |
| - linux*) | |
| + gnu* | linux* | k*bsd*-gnu) | |
| if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
| tmp_addflag= | |
| case $cc_basename,$host_cpu in | |
| @@ -7134,20 +8202,30 @@ | |
| ifc* | ifort*) # Intel Fortran compiler | |
| tmp_addflag=' -nofor_main' ;; | |
| esac | |
| - archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) # Sun C 5.9 | |
| + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' | |
| + tmp_sharedflag='-G' ;; | |
| + *Sun\ F*) # Sun Fortran 8.3 | |
| + tmp_sharedflag='-G' ;; | |
| + *) | |
| + tmp_sharedflag='-shared' ;; | |
| + esac | |
| + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| if test $supports_anon_versioning = yes; then | |
| archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ | |
| cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | |
| $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
| - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| fi | |
| + link_all_deplibs=no | |
| else | |
| ld_shlibs=no | |
| fi | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
| wlarc= | |
| @@ -7245,7 +8323,7 @@ | |
| fi | |
| ;; | |
| - aix4* | aix5*) | |
| + aix[4-9]*) | |
| if test "$host_cpu" = ia64; then | |
| # On IA64, the linker does run time linking by default, so we don't | |
| # have to do anything special. | |
| @@ -7265,7 +8343,7 @@ | |
| # Test if we are trying to use run time linking or normal | |
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we | |
| # need to do runtime linking. | |
| - case $host_os in aix4.[23]|aix4.[23].*|aix5*) | |
| + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | |
| aix_use_runtimelinking=yes | |
| @@ -7299,7 +8377,7 @@ | |
| strings "$collect2name" | grep resolve_lib_name >/dev/null | |
| then | |
| # We have reworked collect2 | |
| - hardcode_direct=yes | |
| + : | |
| else | |
| # We have old collect2 | |
| hardcode_direct=unsupported | |
| @@ -7355,39 +8433,44 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -7416,39 +8499,44 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -7494,7 +8582,7 @@ | |
| # The linker will automatically build a .lib file if we build a DLL. | |
| old_archive_From_new_cmds='true' | |
| # FIXME: Should let the user specify the lib program. | |
| - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' | |
| + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| fix_srcfile_path='`cygpath -w "$srcfile"`' | |
| enable_shared_with_static_runtimes=yes | |
| ;; | |
| @@ -7527,19 +8615,18 @@ | |
| link_all_deplibs=yes | |
| if test "$GCC" = yes ; then | |
| output_verbose_link_cmd='echo' | |
| - archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | |
| + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | |
| + archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" | |
| else | |
| case $cc_basename in | |
| xlc*) | |
| output_verbose_link_cmd='echo' | |
| - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' | |
| + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' | |
| module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| ;; | |
| *) | |
| @@ -7579,7 +8666,7 @@ | |
| ;; | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| hardcode_libdir_flag_spec='-R$libdir' | |
| hardcode_direct=yes | |
| @@ -7681,7 +8768,7 @@ | |
| link_all_deplibs=yes | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
| else | |
| @@ -7701,24 +8788,28 @@ | |
| ;; | |
| openbsd*) | |
| - hardcode_direct=yes | |
| - hardcode_shlibpath_var=no | |
| - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | |
| - export_dynamic_flag_spec='${wl}-E' | |
| + if test -f /usr/libexec/ld.so; then | |
| + hardcode_direct=yes | |
| + hardcode_shlibpath_var=no | |
| + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | |
| + export_dynamic_flag_spec='${wl}-E' | |
| + else | |
| + case $host_os in | |
| + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | |
| + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| + hardcode_libdir_flag_spec='-R$libdir' | |
| + ;; | |
| + *) | |
| + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | |
| + ;; | |
| + esac | |
| + fi | |
| else | |
| - case $host_os in | |
| - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | |
| - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| - hardcode_libdir_flag_spec='-R$libdir' | |
| - ;; | |
| - *) | |
| - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' | |
| - ;; | |
| - esac | |
| + ld_shlibs=no | |
| fi | |
| ;; | |
| @@ -7777,17 +8868,16 @@ | |
| case $host_os in | |
| solaris2.[0-5] | solaris2.[0-5].*) ;; | |
| *) | |
| - # The compiler driver will combine linker options so we | |
| - # cannot just pass the convience library names through | |
| - # without $wl, iff we do not link with $LD. | |
| - # Luckily, gcc supports the same syntax we need for Sun Studio. | |
| + # The compiler driver will combine and reorder linker options, | |
| + # but understands `-z linker_flag'. GCC discards it without `$wl', | |
| + # but is careful enough not to reorder. | |
| # Supported since Solaris 2.6 (maybe 2.5.1?) | |
| - case $wlarc in | |
| - '') | |
| - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; | |
| - *) | |
| - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; | |
| - esac ;; | |
| + if test "$GCC" = yes; then | |
| + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | |
| + else | |
| + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' | |
| + fi | |
| + ;; | |
| esac | |
| link_all_deplibs=yes | |
| ;; | |
| @@ -7844,7 +8934,7 @@ | |
| fi | |
| ;; | |
| - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) | |
| + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) | |
| no_undefined_flag='${wl}-z,text' | |
| archive_cmds_need_lc=no | |
| hardcode_shlibpath_var=no | |
| @@ -7897,8 +8987,8 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 | |
| -echo "${ECHO_T}$ld_shlibs" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 | |
| +echo "${ECHO_T}$ld_shlibs" >&6; } | |
| test "$ld_shlibs" = no && can_build_shared=no | |
| # | |
| @@ -7918,10 +9008,10 @@ | |
| # Test whether the compiler implicitly links with -lc since on some | |
| # systems, -lgcc has to come before -lc. If gcc already passes -lc | |
| # to ld, don't add -lc before -lgcc. | |
| - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | |
| $rm conftest* | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -7956,16 +9046,16 @@ | |
| cat conftest.err 1>&5 | |
| fi | |
| $rm conftest* | |
| - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 | |
| -echo "${ECHO_T}$archive_cmds_need_lc" >&6 | |
| + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 | |
| +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } | |
| ;; | |
| esac | |
| fi | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| @@ -7979,17 +9069,55 @@ | |
| version_type=none | |
| dynamic_linker="$host_os ld.so" | |
| sys_lib_dlsearch_path_spec="/lib /usr/lib" | |
| + | |
| if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | |
| + case $host_os in | |
| + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; | |
| + *) lt_awk_arg="/^libraries:/" ;; | |
| + esac | |
| + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then | |
| # if the path contains ";" then we assume it to be the separator | |
| # otherwise default to the standard path separator (i.e. ":") - it is | |
| # assumed that no part of a normal pathname contains ";" but that should | |
| # okay in the real world where ";" in dirpaths is itself problematic. | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | |
| + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` | |
| else | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| fi | |
| + # Ok, now we have the path, separated by spaces, we can step through it | |
| + # and add multilib dir if necessary. | |
| + lt_tmp_lt_search_path_spec= | |
| + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` | |
| + for lt_sys_path in $lt_search_path_spec; do | |
| + if test -d "$lt_sys_path/$lt_multi_os_dir"; then | |
| + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" | |
| + else | |
| + test -d "$lt_sys_path" && \ | |
| + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" | |
| + fi | |
| + done | |
| + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' | |
| +BEGIN {RS=" "; FS="/|\n";} { | |
| + lt_foo=""; | |
| + lt_count=0; | |
| + for (lt_i = NF; lt_i > 0; lt_i--) { | |
| + if ($lt_i != "" && $lt_i != ".") { | |
| + if ($lt_i == "..") { | |
| + lt_count++; | |
| + } else { | |
| + if (lt_count == 0) { | |
| + lt_foo="/" $lt_i lt_foo; | |
| + } else { | |
| + lt_count--; | |
| + } | |
| + } | |
| + } | |
| + } | |
| + if (lt_foo != "") { lt_freq[lt_foo]++; } | |
| + if (lt_freq[lt_foo] == 1) { print lt_foo; } | |
| +}'` | |
| + sys_lib_search_path_spec=`echo $lt_search_path_spec` | |
| else | |
| sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | |
| fi | |
| @@ -8010,7 +9138,7 @@ | |
| soname_spec='${libname}${release}${shared_ext}$major' | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[4-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -8149,12 +9277,8 @@ | |
| shlibpath_overrides_runpath=yes | |
| shlibpath_var=DYLD_LIBRARY_PATH | |
| shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' | |
| - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. | |
| - if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| - else | |
| - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| - fi | |
| + | |
| + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" | |
| sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' | |
| ;; | |
| @@ -8171,18 +9295,6 @@ | |
| dynamic_linker=no | |
| ;; | |
| -kfreebsd*-gnu) | |
| - version_type=linux | |
| - need_lib_prefix=no | |
| - need_version=no | |
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| - soname_spec='${libname}${release}${shared_ext}$major' | |
| - shlibpath_var=LD_LIBRARY_PATH | |
| - shlibpath_overrides_runpath=no | |
| - hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| - ;; | |
| - | |
| freebsd* | dragonfly*) | |
| # DragonFly does not have aout. When/if they implement a new | |
| # versioning mechanism, adjust this. | |
| @@ -8220,7 +9332,7 @@ | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| ;; | |
| - freebsd*) # from 4.6 on | |
| + *) # from 4.6 on, and DragonFly | |
| shlibpath_overrides_runpath=yes | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -8283,7 +9395,7 @@ | |
| postinstall_cmds='chmod 555 $lib' | |
| ;; | |
| -interix3*) | |
| +interix[3-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -8338,7 +9450,7 @@ | |
| ;; | |
| # This must be Linux ELF. | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -8352,31 +9464,10 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # find out which ABI we are using | |
| - libsuff= | |
| - case "$host_cpu" in | |
| - x86_64*|s390x*|powerpc64*) | |
| - echo '#line 8359 "configure"' > conftest.$ac_ext | |
| - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; then | |
| - case `/usr/bin/file conftest.$ac_objext` in | |
| - *64-bit*) | |
| - libsuff=64 | |
| - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| - ;; | |
| - esac | |
| - fi | |
| - rm -rf conftest* | |
| - ;; | |
| - esac | |
| - | |
| # Append ld.so.conf contents to the search path | |
| if test -f /etc/ld.so.conf; then | |
| - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
| fi | |
| # We used to test for /lib/ld.so.1 and disable shared libraries on | |
| @@ -8388,7 +9479,7 @@ | |
| dynamic_linker='GNU/Linux ld.so' | |
| ;; | |
| -knetbsd*-gnu) | |
| +netbsdelf*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -8397,7 +9488,7 @@ | |
| shlibpath_var=LD_LIBRARY_PATH | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| + dynamic_linker='NetBSD ld.elf_so' | |
| ;; | |
| netbsd*) | |
| @@ -8481,6 +9572,10 @@ | |
| sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | |
| ;; | |
| +rdos*) | |
| + dynamic_linker=no | |
| + ;; | |
| + | |
| solaris*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| @@ -8573,17 +9668,32 @@ | |
| dynamic_linker=no | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| -echo "${ECHO_T}$dynamic_linker" >&6 | |
| +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| +echo "${ECHO_T}$dynamic_linker" >&6; } | |
| test "$dynamic_linker" = no && can_build_shared=no | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" | |
| +fi | |
| + | |
| +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" | |
| +fi | |
| + | |
| +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" | |
| + | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | |
| hardcode_action= | |
| if test -n "$hardcode_libdir_flag_spec" || \ | |
| test -n "$runpath_var" || \ | |
| @@ -8607,8 +9717,8 @@ | |
| # directories. | |
| hardcode_action=unsupported | |
| fi | |
| -echo "$as_me:$LINENO: result: $hardcode_action" >&5 | |
| -echo "${ECHO_T}$hardcode_action" >&6 | |
| +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 | |
| +echo "${ECHO_T}$hardcode_action" >&6; } | |
| if test "$hardcode_action" = relink; then | |
| # Fast installation is not supported | |
| @@ -8621,29 +9731,30 @@ | |
| striplib= | |
| old_striplib= | |
| -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 | |
| +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } | |
| if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then | |
| test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" | |
| test -z "$striplib" && striplib="$STRIP --strip-unneeded" | |
| - echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| + { echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| else | |
| # FIXME - insert some real tests, host_os isn't really good enough | |
| case $host_os in | |
| darwin*) | |
| if test -n "$STRIP" ; then | |
| striplib="$STRIP -x" | |
| - echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| + old_striplib="$STRIP -S" | |
| + { echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| ;; | |
| *) | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| ;; | |
| esac | |
| fi | |
| @@ -8675,8 +9786,8 @@ | |
| darwin*) | |
| # if libdl is installed we need to link against it | |
| - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | |
| -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | |
| +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } | |
| if test "${ac_cv_lib_dl_dlopen+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -8689,56 +9800,53 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char dlopen (); | |
| int | |
| main () | |
| { | |
| -dlopen (); | |
| +return dlopen (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| ac_cv_lib_dl_dlopen=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_lib_dl_dlopen=no | |
| + ac_cv_lib_dl_dlopen=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| LIBS=$ac_check_lib_save_LIBS | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | |
| -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | |
| +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } | |
| if test $ac_cv_lib_dl_dlopen = yes; then | |
| lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | |
| else | |
| @@ -8752,8 +9860,8 @@ | |
| ;; | |
| *) | |
| - echo "$as_me:$LINENO: checking for shl_load" >&5 | |
| -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for shl_load" >&5 | |
| +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } | |
| if test "${ac_cv_func_shl_load+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -8780,73 +9888,64 @@ | |
| #undef shl_load | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| -{ | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char shl_load (); | |
| /* The GNU C library defines this for functions which it implements | |
| to always fail with ENOSYS. Some functions are actually named | |
| something starting with __ and the normal name is an alias. */ | |
| -#if defined (__stub_shl_load) || defined (__stub___shl_load) | |
| +#if defined __stub_shl_load || defined __stub___shl_load | |
| choke me | |
| -#else | |
| -char (*f) () = shl_load; | |
| -#endif | |
| -#ifdef __cplusplus | |
| -} | |
| #endif | |
| int | |
| main () | |
| { | |
| -return f != shl_load; | |
| +return shl_load (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| ac_cv_func_shl_load=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_func_shl_load=no | |
| + ac_cv_func_shl_load=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | |
| -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 | |
| +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } | |
| if test $ac_cv_func_shl_load = yes; then | |
| lt_cv_dlopen="shl_load" | |
| else | |
| - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 | |
| -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 | |
| +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } | |
| if test "${ac_cv_lib_dld_shl_load+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -8859,61 +9958,58 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char shl_load (); | |
| int | |
| main () | |
| { | |
| -shl_load (); | |
| +return shl_load (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| ac_cv_lib_dld_shl_load=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_lib_dld_shl_load=no | |
| + ac_cv_lib_dld_shl_load=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| LIBS=$ac_check_lib_save_LIBS | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 | |
| -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 | |
| +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } | |
| if test $ac_cv_lib_dld_shl_load = yes; then | |
| - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" | |
| + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" | |
| else | |
| - echo "$as_me:$LINENO: checking for dlopen" >&5 | |
| -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for dlopen" >&5 | |
| +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } | |
| if test "${ac_cv_func_dlopen+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -8940,73 +10036,64 @@ | |
| #undef dlopen | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| -{ | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char dlopen (); | |
| /* The GNU C library defines this for functions which it implements | |
| to always fail with ENOSYS. Some functions are actually named | |
| something starting with __ and the normal name is an alias. */ | |
| -#if defined (__stub_dlopen) || defined (__stub___dlopen) | |
| +#if defined __stub_dlopen || defined __stub___dlopen | |
| choke me | |
| -#else | |
| -char (*f) () = dlopen; | |
| -#endif | |
| -#ifdef __cplusplus | |
| -} | |
| #endif | |
| int | |
| main () | |
| { | |
| -return f != dlopen; | |
| +return dlopen (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| ac_cv_func_dlopen=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_func_dlopen=no | |
| + ac_cv_func_dlopen=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | |
| -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 | |
| +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } | |
| if test $ac_cv_func_dlopen = yes; then | |
| lt_cv_dlopen="dlopen" | |
| else | |
| - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | |
| -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 | |
| +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } | |
| if test "${ac_cv_lib_dl_dlopen+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -9019,61 +10106,58 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char dlopen (); | |
| int | |
| main () | |
| { | |
| -dlopen (); | |
| +return dlopen (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| ac_cv_lib_dl_dlopen=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_lib_dl_dlopen=no | |
| + ac_cv_lib_dl_dlopen=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| LIBS=$ac_check_lib_save_LIBS | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | |
| -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 | |
| +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } | |
| if test $ac_cv_lib_dl_dlopen = yes; then | |
| lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" | |
| else | |
| - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 | |
| -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 | |
| +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } | |
| if test "${ac_cv_lib_svld_dlopen+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -9086,61 +10170,58 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char dlopen (); | |
| int | |
| main () | |
| { | |
| -dlopen (); | |
| +return dlopen (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| ac_cv_lib_svld_dlopen=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_lib_svld_dlopen=no | |
| + ac_cv_lib_svld_dlopen=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| LIBS=$ac_check_lib_save_LIBS | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 | |
| -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 | |
| +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } | |
| if test $ac_cv_lib_svld_dlopen = yes; then | |
| lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" | |
| else | |
| - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 | |
| -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 | |
| +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } | |
| if test "${ac_cv_lib_dld_dld_link+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -9153,58 +10234,55 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char dld_link (); | |
| int | |
| main () | |
| { | |
| -dld_link (); | |
| +return dld_link (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| ac_cv_lib_dld_dld_link=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_lib_dld_dld_link=no | |
| + ac_cv_lib_dld_dld_link=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| LIBS=$ac_check_lib_save_LIBS | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 | |
| -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 | |
| +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } | |
| if test $ac_cv_lib_dld_dld_link = yes; then | |
| - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" | |
| + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" | |
| fi | |
| @@ -9242,8 +10320,8 @@ | |
| save_LIBS="$LIBS" | |
| LIBS="$lt_cv_dlopen_libs $LIBS" | |
| - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 | |
| -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 | |
| +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } | |
| if test "${lt_cv_dlopen_self+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -9253,7 +10331,7 @@ | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<EOF | |
| -#line 9256 "configure" | |
| +#line 10334 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -9337,13 +10415,13 @@ | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 | |
| -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 | |
| +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } | |
| if test "x$lt_cv_dlopen_self" = xyes; then | |
| wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" | |
| - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 | |
| -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 | |
| +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } | |
| if test "${lt_cv_dlopen_self_static+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -9353,7 +10431,7 @@ | |
| lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | |
| lt_status=$lt_dlunknown | |
| cat > conftest.$ac_ext <<EOF | |
| -#line 9356 "configure" | |
| +#line 10434 "configure" | |
| #include "confdefs.h" | |
| #if HAVE_DLFCN_H | |
| @@ -9437,8 +10515,8 @@ | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 | |
| -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 | |
| +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } | |
| fi | |
| CPPFLAGS="$save_CPPFLAGS" | |
| @@ -9460,13 +10538,13 @@ | |
| # Report which library types will actually be built | |
| -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | |
| -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 | |
| -echo "$as_me:$LINENO: result: $can_build_shared" >&5 | |
| -echo "${ECHO_T}$can_build_shared" >&6 | |
| +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | |
| +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } | |
| +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 | |
| +echo "${ECHO_T}$can_build_shared" >&6; } | |
| -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | |
| -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | |
| +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } | |
| test "$can_build_shared" = "no" && enable_shared=no | |
| # On AIX, shared libraries and static libraries use the same namespace, and | |
| @@ -9480,21 +10558,21 @@ | |
| fi | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[4-9]*) | |
| if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| test "$enable_shared" = yes && enable_static=no | |
| fi | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: result: $enable_shared" >&5 | |
| -echo "${ECHO_T}$enable_shared" >&6 | |
| +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 | |
| +echo "${ECHO_T}$enable_shared" >&6; } | |
| -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | |
| -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | |
| +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } | |
| # Make sure either enable_shared or enable_static is yes. | |
| test "$enable_shared" = yes || enable_static=yes | |
| -echo "$as_me:$LINENO: result: $enable_static" >&5 | |
| -echo "${ECHO_T}$enable_static" >&6 | |
| +{ echo "$as_me:$LINENO: result: $enable_static" >&5 | |
| +echo "${ECHO_T}$enable_static" >&6; } | |
| # The else clause should only fire when bootstrapping the | |
| # libtool distribution, otherwise you forgot to ship ltmain.sh | |
| @@ -9536,6 +10614,7 @@ | |
| predeps \ | |
| postdeps \ | |
| compiler_lib_search_path \ | |
| + compiler_lib_search_dirs \ | |
| archive_cmds \ | |
| archive_expsym_cmds \ | |
| postinstall_cmds \ | |
| @@ -9551,6 +10630,7 @@ | |
| module_cmds \ | |
| module_expsym_cmds \ | |
| lt_cv_prog_compiler_c_o \ | |
| + fix_srcfile_path \ | |
| exclude_expsyms \ | |
| include_expsyms; do | |
| @@ -9595,7 +10675,7 @@ | |
| # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) | |
| # NOTE: Changes made to this file will be lost: look at ltmain.sh. | |
| # | |
| -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 | |
| +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 | |
| # Free Software Foundation, Inc. | |
| # | |
| # This file is part of GNU Libtool: | |
| @@ -9831,6 +10911,10 @@ | |
| # shared library. | |
| postdeps=$lt_postdeps | |
| +# The directories searched by this compiler when creating a shared | |
| +# library | |
| +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs | |
| + | |
| # The library search path used internally by the compiler when linking | |
| # a shared library. | |
| compiler_lib_search_path=$lt_compiler_lib_search_path | |
| @@ -9919,7 +11003,7 @@ | |
| sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Fix the shell variable \$srcfile for the compiler. | |
| -fix_srcfile_path="$fix_srcfile_path" | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| # Set to yes if exported symbols are required. | |
| always_export_symbols=$always_export_symbols | |
| @@ -9986,11 +11070,11 @@ | |
| CC="$lt_save_CC" | |
| -# Check whether --with-tags or --without-tags was given. | |
| +# Check whether --with-tags was given. | |
| if test "${with_tags+set}" = set; then | |
| - withval="$with_tags" | |
| - tagnames="$withval" | |
| -fi; | |
| + withval=$with_tags; tagnames="$withval" | |
| +fi | |
| + | |
| if test -f "$ltmain" && test -n "$tagnames"; then | |
| if test ! -f "${ofile}"; then | |
| @@ -10044,7 +11128,7 @@ | |
| if test -n "$CXX" && ( test "X$CXX" != "Xno" && | |
| ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || | |
| (test "X$CXX" != "Xg++"))) ; then | |
| - ac_ext=cc | |
| + ac_ext=cpp | |
| ac_cpp='$CXXCPP $CPPFLAGS' | |
| ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | |
| @@ -10079,6 +11163,7 @@ | |
| predeps_CXX= | |
| postdeps_CXX= | |
| compiler_lib_search_path_CXX= | |
| +compiler_lib_search_dirs_CXX= | |
| # Source file extension for C++ test sources. | |
| ac_ext=cpp | |
| @@ -10088,10 +11173,10 @@ | |
| objext_CXX=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code="int some_variable = 0;\n" | |
| +lt_simple_compile_test_code="int some_variable = 0;" | |
| # Code to be used in simple link tests | |
| -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' | |
| +lt_simple_link_test_code='int main(int, char *[]) { return(0); }' | |
| # ltmain only uses $CC for tagged configurations so make sure $CC is set. | |
| @@ -10107,16 +11192,16 @@ | |
| # save warnings/boilerplate of simple test code | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_compiler_boilerplate=`cat conftest.err` | |
| $rm conftest* | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_link_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_link_test_code" >conftest.$ac_ext | |
| eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_linker_boilerplate=`cat conftest.err` | |
| -$rm conftest* | |
| +$rm -r conftest* | |
| # Allow CC to be a program name with arguments. | |
| @@ -10163,18 +11248,18 @@ | |
| # Set up default GNU C++ configuration | |
| -# Check whether --with-gnu-ld or --without-gnu-ld was given. | |
| +# Check whether --with-gnu-ld was given. | |
| if test "${with_gnu_ld+set}" = set; then | |
| - withval="$with_gnu_ld" | |
| - test "$withval" = no || with_gnu_ld=yes | |
| + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes | |
| else | |
| with_gnu_ld=no | |
| -fi; | |
| +fi | |
| + | |
| ac_prog=ld | |
| if test "$GCC" = yes; then | |
| # Check if gcc -print-prog-name=ld gives a path. | |
| - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | |
| -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 | |
| +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } | |
| case $host in | |
| *-*-mingw*) | |
| # gcc leaves a trailing carriage return which upsets mingw | |
| @@ -10203,11 +11288,11 @@ | |
| ;; | |
| esac | |
| elif test "$with_gnu_ld" = yes; then | |
| - echo "$as_me:$LINENO: checking for GNU ld" >&5 | |
| -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for GNU ld" >&5 | |
| +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | |
| -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 | |
| +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } | |
| fi | |
| if test "${lt_cv_path_LD+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| @@ -10240,17 +11325,17 @@ | |
| LD="$lt_cv_path_LD" | |
| if test -n "$LD"; then | |
| - echo "$as_me:$LINENO: result: $LD" >&5 | |
| -echo "${ECHO_T}$LD" >&6 | |
| + { echo "$as_me:$LINENO: result: $LD" >&5 | |
| +echo "${ECHO_T}$LD" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 | |
| echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} | |
| { (exit 1); exit 1; }; } | |
| -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | |
| -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 | |
| +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_gnu_ld+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -10264,8 +11349,8 @@ | |
| ;; | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } | |
| with_gnu_ld=$lt_cv_prog_gnu_ld | |
| @@ -10315,15 +11400,15 @@ | |
| fi | |
| # PORTME: fill in a description of your system's C++ link characteristics | |
| -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | |
| ld_shlibs_CXX=yes | |
| case $host_os in | |
| aix3*) | |
| # FIXME: insert proper C++ library support | |
| ld_shlibs_CXX=no | |
| ;; | |
| - aix4* | aix5*) | |
| + aix[4-9]*) | |
| if test "$host_cpu" = ia64; then | |
| # On IA64, the linker does run time linking by default, so we don't | |
| # have to do anything special. | |
| @@ -10336,7 +11421,7 @@ | |
| # Test if we are trying to use run time linking or normal | |
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we | |
| # need to do runtime linking. | |
| - case $host_os in aix4.[23]|aix4.[23].*|aix5*) | |
| + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| case $ld_flag in | |
| *-brtl*) | |
| @@ -10372,7 +11457,7 @@ | |
| strings "$collect2name" | grep resolve_lib_name >/dev/null | |
| then | |
| # We have reworked collect2 | |
| - hardcode_direct_CXX=yes | |
| + : | |
| else | |
| # We have old collect2 | |
| hardcode_direct_CXX=unsupported | |
| @@ -10428,39 +11513,44 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_cxx_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -10490,39 +11580,44 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_cxx_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_cxx_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -10584,59 +11679,31 @@ | |
| fi | |
| ;; | |
| darwin* | rhapsody*) | |
| - case $host_os in | |
| - rhapsody* | darwin1.[012]) | |
| - allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' | |
| - ;; | |
| - *) # Darwin 1.3 on | |
| - if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then | |
| - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' | |
| - else | |
| - case ${MACOSX_DEPLOYMENT_TARGET} in | |
| - 10.[012]) | |
| - allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' | |
| - ;; | |
| - 10.*) | |
| - allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' | |
| - ;; | |
| - esac | |
| - fi | |
| - ;; | |
| - esac | |
| archive_cmds_need_lc_CXX=no | |
| hardcode_direct_CXX=no | |
| hardcode_automatic_CXX=yes | |
| hardcode_shlibpath_var_CXX=unsupported | |
| whole_archive_flag_spec_CXX='' | |
| link_all_deplibs_CXX=yes | |
| - | |
| - if test "$GXX" = yes ; then | |
| - lt_int_apple_cc_single_mod=no | |
| + allow_undefined_flag_CXX="$_lt_dar_allow_undefined" | |
| + if test "$GXX" = yes ; then | |
| output_verbose_link_cmd='echo' | |
| - if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then | |
| - lt_int_apple_cc_single_mod=yes | |
| + archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | |
| + module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | |
| + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + if test "$lt_cv_apple_cc_single_mod" != "yes"; then | |
| + archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" | |
| + archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" | |
| fi | |
| - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| - archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - else | |
| - archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - fi | |
| - module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then | |
| - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - else | |
| - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - fi | |
| - module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| else | |
| case $cc_basename in | |
| xlc*) | |
| output_verbose_link_cmd='echo' | |
| - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' | |
| + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' | |
| module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| ;; | |
| *) | |
| @@ -10670,7 +11737,7 @@ | |
| freebsd-elf*) | |
| archive_cmds_need_lc_CXX=no | |
| ;; | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF | |
| # conventions | |
| ld_shlibs_CXX=yes | |
| @@ -10719,9 +11786,7 @@ | |
| hardcode_libdir_separator_CXX=: | |
| case $host_cpu in | |
| - hppa*64*|ia64*) | |
| - hardcode_libdir_flag_spec_ld_CXX='+b $libdir' | |
| - ;; | |
| + hppa*64*|ia64*) ;; | |
| *) | |
| export_dynamic_flag_spec_CXX='${wl}-E' | |
| ;; | |
| @@ -10789,7 +11854,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| hardcode_direct_CXX=no | |
| hardcode_shlibpath_var_CXX=no | |
| hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' | |
| @@ -10829,7 +11894,7 @@ | |
| hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' | |
| hardcode_libdir_separator_CXX=: | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| KCC*) | |
| # Kuck and Associates, Inc. (KAI) C++ Compiler | |
| @@ -10881,7 +11946,7 @@ | |
| export_dynamic_flag_spec_CXX='${wl}--export-dynamic' | |
| whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' | |
| ;; | |
| - pgCC*) | |
| + pgCC* | pgcpp*) | |
| # Portland Group C++ compiler | |
| archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' | |
| archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' | |
| @@ -10909,6 +11974,29 @@ | |
| # dependencies. | |
| output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' | |
| ;; | |
| + *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C++ 5.9 | |
| + no_undefined_flag_CXX=' -zdefs' | |
| + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' | |
| + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' | |
| + hardcode_libdir_flag_spec_CXX='-R$libdir' | |
| + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' | |
| + | |
| + # Not sure whether something based on | |
| + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | |
| + # would be better. | |
| + output_verbose_link_cmd='echo' | |
| + | |
| + # Archives containing C++ object files must be created using | |
| + # "CC -xar", where "CC" is the Sun C++ compiler. This is | |
| + # necessary to make sure instantiated templates are included | |
| + # in the archive. | |
| + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' | |
| + ;; | |
| + esac | |
| + ;; | |
| esac | |
| ;; | |
| lynxos*) | |
| @@ -10931,7 +12019,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' | |
| wlarc= | |
| @@ -10947,16 +12035,20 @@ | |
| ld_shlibs_CXX=no | |
| ;; | |
| openbsd*) | |
| - hardcode_direct_CXX=yes | |
| - hardcode_shlibpath_var_CXX=no | |
| - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' | |
| - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' | |
| - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' | |
| - export_dynamic_flag_spec_CXX='${wl}-E' | |
| - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | |
| + if test -f /usr/libexec/ld.so; then | |
| + hardcode_direct_CXX=yes | |
| + hardcode_shlibpath_var_CXX=no | |
| + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' | |
| + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' | |
| + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' | |
| + export_dynamic_flag_spec_CXX='${wl}-E' | |
| + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' | |
| + fi | |
| + output_verbose_link_cmd='echo' | |
| + else | |
| + ld_shlibs_CXX=no | |
| fi | |
| - output_verbose_link_cmd='echo' | |
| ;; | |
| osf3*) | |
| case $cc_basename in | |
| @@ -11118,15 +12210,10 @@ | |
| case $host_os in | |
| solaris2.[0-5] | solaris2.[0-5].*) ;; | |
| *) | |
| - # The C++ compiler is used as linker so we must use $wl | |
| - # flag to pass the commands to the underlying system | |
| - # linker. We must also pass each convience library through | |
| - # to the system linker between allextract/defaultextract. | |
| - # The C++ compiler will combine linker options so we | |
| - # cannot just pass the convience library names through | |
| - # without $wl. | |
| + # The compiler driver will combine and reorder linker options, | |
| + # but understands `-z linker_flag'. | |
| # Supported since Solaris 2.6 (maybe 2.5.1?) | |
| - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' | |
| + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' | |
| ;; | |
| esac | |
| link_all_deplibs_CXX=yes | |
| @@ -11173,6 +12260,12 @@ | |
| fi | |
| hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' | |
| + case $host_os in | |
| + solaris2.[0-5] | solaris2.[0-5].*) ;; | |
| + *) | |
| + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | |
| + ;; | |
| + esac | |
| fi | |
| ;; | |
| esac | |
| @@ -11253,14 +12346,13 @@ | |
| ld_shlibs_CXX=no | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | |
| -echo "${ECHO_T}$ld_shlibs_CXX" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | |
| +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } | |
| test "$ld_shlibs_CXX" = no && can_build_shared=no | |
| GCC_CXX="$GXX" | |
| LD_CXX="$LD" | |
| - | |
| cat > conftest.$ac_ext <<EOF | |
| class Foo | |
| { | |
| @@ -11362,9 +12454,14 @@ | |
| $rm -f confest.$objext | |
| +compiler_lib_search_dirs_CXX= | |
| +if test -n "$compiler_lib_search_path_CXX"; then | |
| + compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` | |
| +fi | |
| + | |
| # PORTME: override above test on systems where it is broken | |
| case $host_os in | |
| -interix3*) | |
| +interix[3-9]*) | |
| # Interix 3.5 installs completely hosed .la files for C++, so rather than | |
| # hack all around it, let's just trust "g++" to DTRT. | |
| predep_objects_CXX= | |
| @@ -11372,19 +12469,51 @@ | |
| postdeps_CXX= | |
| ;; | |
| +linux*) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C++ 5.9 | |
| + # | |
| + # The more standards-conforming stlport4 library is | |
| + # incompatible with the Cstd library. Avoid specifying | |
| + # it if it's in CXXFLAGS. Ignore libCrun as | |
| + # -library=stlport4 depends on it. | |
| + case " $CXX $CXXFLAGS " in | |
| + *" -library=stlport4 "*) | |
| + solaris_use_stlport4=yes | |
| + ;; | |
| + esac | |
| + if test "$solaris_use_stlport4" != yes; then | |
| + postdeps_CXX='-library=Cstd -library=Crun' | |
| + fi | |
| + ;; | |
| + esac | |
| + ;; | |
| + | |
| solaris*) | |
| case $cc_basename in | |
| CC*) | |
| + # The more standards-conforming stlport4 library is | |
| + # incompatible with the Cstd library. Avoid specifying | |
| + # it if it's in CXXFLAGS. Ignore libCrun as | |
| + # -library=stlport4 depends on it. | |
| + case " $CXX $CXXFLAGS " in | |
| + *" -library=stlport4 "*) | |
| + solaris_use_stlport4=yes | |
| + ;; | |
| + esac | |
| + | |
| # Adding this requires a known-good setup of shared libraries for | |
| # Sun compiler versions before 5.6, else PIC objects from an old | |
| # archive will be linked into the output, leading to subtle bugs. | |
| - postdeps_CXX='-lCstd -lCrun' | |
| + if test "$solaris_use_stlport4" != yes; then | |
| + postdeps_CXX='-library=Cstd -library=Crun' | |
| + fi | |
| ;; | |
| esac | |
| ;; | |
| esac | |
| - | |
| case " $postdeps_CXX " in | |
| *" -lc "*) archive_cmds_need_lc_CXX=no ;; | |
| esac | |
| @@ -11393,8 +12522,8 @@ | |
| lt_prog_compiler_pic_CXX= | |
| lt_prog_compiler_static_CXX= | |
| -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |
| # C++ specific cases for pic, static, wl, etc. | |
| if test "$GXX" = yes; then | |
| @@ -11415,12 +12544,14 @@ | |
| # like `-m68040'. | |
| lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' | |
| ;; | |
| - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| # PIC is the default for these OSes. | |
| ;; | |
| - mingw* | os2* | pw32*) | |
| + mingw* | cygwin* | os2* | pw32*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| + # Although the cygwin gcc ignores -fPIC, still need this for old-style | |
| + # (--disable-auto-import) libraries | |
| lt_prog_compiler_pic_CXX='-DDLL_EXPORT' | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -11432,7 +12563,7 @@ | |
| # DJGPP does not support shared libraries at all | |
| lt_prog_compiler_pic_CXX= | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| # Interix 3.x gcc -fpic/-fPIC options generate broken code. | |
| # Instead, we relocate shared libraries at runtime. | |
| ;; | |
| @@ -11458,7 +12589,7 @@ | |
| esac | |
| else | |
| case $host_os in | |
| - aix4* | aix5*) | |
| + aix[4-9]*) | |
| # All AIX code is PIC. | |
| if test "$host_cpu" = ia64; then | |
| # AIX 5 now supports IA64 processor | |
| @@ -11498,7 +12629,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| # FreeBSD uses GNU C++ | |
| ;; | |
| hpux9* | hpux10* | hpux11*) | |
| @@ -11541,7 +12672,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| KCC*) | |
| # KAI C++ Compiler | |
| @@ -11554,7 +12685,7 @@ | |
| lt_prog_compiler_pic_CXX='-KPIC' | |
| lt_prog_compiler_static_CXX='-static' | |
| ;; | |
| - pgCC*) | |
| + pgCC* | pgcpp*) | |
| # Portland Group C++ compiler. | |
| lt_prog_compiler_wl_CXX='-Wl,' | |
| lt_prog_compiler_pic_CXX='-fpic' | |
| @@ -11568,6 +12699,14 @@ | |
| lt_prog_compiler_static_CXX='-non_shared' | |
| ;; | |
| *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C++ 5.9 | |
| + lt_prog_compiler_pic_CXX='-KPIC' | |
| + lt_prog_compiler_static_CXX='-Bstatic' | |
| + lt_prog_compiler_wl_CXX='-Qoption ld ' | |
| + ;; | |
| + esac | |
| ;; | |
| esac | |
| ;; | |
| @@ -11584,7 +12723,7 @@ | |
| ;; | |
| esac | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| ;; | |
| osf3* | osf4* | osf5*) | |
| case $cc_basename in | |
| @@ -11667,22 +12806,22 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 | |
| +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| # | |
| if test -n "$lt_prog_compiler_pic_CXX"; then | |
| -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 | |
| -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 | |
| +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_pic_works_CXX=no | |
| + lt_cv_prog_compiler_pic_works_CXX=no | |
| ac_outfile=conftest.$ac_objext | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| # (2) before a word containing "conftest.", or (3) at the end. | |
| @@ -11693,27 +12832,27 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:11696: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:12835: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>conftest.err) | |
| ac_status=$? | |
| cat conftest.err >&5 | |
| - echo "$as_me:11700: \$? = $ac_status" >&5 | |
| + echo "$as_me:12839: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s "$ac_outfile"; then | |
| # The compiler can only warn and ignore the option if not recognized | |
| # So say no if there are warnings other than the usual output. | |
| $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_pic_works_CXX=yes | |
| + lt_cv_prog_compiler_pic_works_CXX=yes | |
| fi | |
| fi | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } | |
| -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then | |
| case $lt_prog_compiler_pic_CXX in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; | |
| @@ -11738,15 +12877,15 @@ | |
| # Check to make sure the static flag actually works. | |
| # | |
| wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" | |
| -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_static_works_CXX+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_static_works_CXX=no | |
| + lt_cv_prog_compiler_static_works_CXX=no | |
| save_LDFLAGS="$LDFLAGS" | |
| LDFLAGS="$LDFLAGS $lt_tmp_static_flag" | |
| - printf "$lt_simple_link_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_link_test_code" > conftest.$ac_ext | |
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | |
| # The linker can only warn and ignore the option if not recognized | |
| # So say no if there are warnings | |
| @@ -11756,28 +12895,28 @@ | |
| $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_static_works_CXX=yes | |
| + lt_cv_prog_compiler_static_works_CXX=yes | |
| fi | |
| else | |
| - lt_prog_compiler_static_works_CXX=yes | |
| + lt_cv_prog_compiler_static_works_CXX=yes | |
| fi | |
| fi | |
| - $rm conftest* | |
| + $rm -r conftest* | |
| LDFLAGS="$save_LDFLAGS" | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } | |
| -if test x"$lt_prog_compiler_static_works_CXX" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static_CXX= | |
| fi | |
| -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -11786,7 +12925,7 @@ | |
| mkdir conftest | |
| cd conftest | |
| mkdir out | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="-o out/conftest2.$ac_objext" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| @@ -11797,11 +12936,11 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:11800: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:12939: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>out/conftest.err) | |
| ac_status=$? | |
| cat out/conftest.err >&5 | |
| - echo "$as_me:11804: \$? = $ac_status" >&5 | |
| + echo "$as_me:12943: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
| then | |
| # The compiler can only warn and ignore the option if not recognized | |
| @@ -11823,23 +12962,23 @@ | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } | |
| hard_links="nottested" | |
| if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then | |
| # do not overwrite the value of need_locks provided by the user | |
| - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | |
| hard_links=yes | |
| $rm conftest* | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| touch conftest.a | |
| ln conftest.a conftest.b 2>&5 || hard_links=no | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| - echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| -echo "${ECHO_T}$hard_links" >&6 | |
| + { echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| +echo "${ECHO_T}$hard_links" >&6; } | |
| if test "$hard_links" = no; then | |
| { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | |
| echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | |
| @@ -11849,12 +12988,12 @@ | |
| need_locks=no | |
| fi | |
| -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | |
| export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
| case $host_os in | |
| - aix4* | aix5*) | |
| + aix[4-9]*) | |
| # If we're using GNU nm, then we don't want the "-C" option. | |
| # -C means demangle to AIX nm, but means don't demangle with GNU nm | |
| if $NM -V 2>&1 | grep 'GNU' > /dev/null; then | |
| @@ -11867,15 +13006,19 @@ | |
| export_symbols_cmds_CXX="$ltdll_cmds" | |
| ;; | |
| cygwin* | mingw*) | |
| - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' | |
| + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| + ;; | |
| + linux* | k*bsd*-gnu) | |
| + link_all_deplibs_CXX=no | |
| ;; | |
| *) | |
| export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' | |
| ;; | |
| esac | |
| + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | |
| -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | |
| -echo "${ECHO_T}$ld_shlibs_CXX" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 | |
| +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } | |
| test "$ld_shlibs_CXX" = no && can_build_shared=no | |
| # | |
| @@ -11895,10 +13038,10 @@ | |
| # Test whether the compiler implicitly links with -lc since on some | |
| # systems, -lgcc has to come before -lc. If gcc already passes -lc | |
| # to ld, don't add -lc before -lgcc. | |
| - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | |
| $rm conftest* | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -11933,16 +13076,16 @@ | |
| cat conftest.err 1>&5 | |
| fi | |
| $rm conftest* | |
| - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 | |
| -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 | |
| + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 | |
| +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } | |
| ;; | |
| esac | |
| fi | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| @@ -11956,20 +13099,7 @@ | |
| version_type=none | |
| dynamic_linker="$host_os ld.so" | |
| sys_lib_dlsearch_path_spec="/lib /usr/lib" | |
| -if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | |
| - # if the path contains ";" then we assume it to be the separator | |
| - # otherwise default to the standard path separator (i.e. ":") - it is | |
| - # assumed that no part of a normal pathname contains ";" but that should | |
| - # okay in the real world where ";" in dirpaths is itself problematic. | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | |
| - else | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| - fi | |
| -else | |
| - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | |
| -fi | |
| + | |
| need_lib_prefix=unknown | |
| hardcode_into_libs=no | |
| @@ -11987,7 +13117,7 @@ | |
| soname_spec='${libname}${release}${shared_ext}$major' | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[4-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -12126,12 +13256,7 @@ | |
| shlibpath_overrides_runpath=yes | |
| shlibpath_var=DYLD_LIBRARY_PATH | |
| shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' | |
| - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. | |
| - if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| - else | |
| - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| - fi | |
| + | |
| sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' | |
| ;; | |
| @@ -12148,18 +13273,6 @@ | |
| dynamic_linker=no | |
| ;; | |
| -kfreebsd*-gnu) | |
| - version_type=linux | |
| - need_lib_prefix=no | |
| - need_version=no | |
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| - soname_spec='${libname}${release}${shared_ext}$major' | |
| - shlibpath_var=LD_LIBRARY_PATH | |
| - shlibpath_overrides_runpath=no | |
| - hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| - ;; | |
| - | |
| freebsd* | dragonfly*) | |
| # DragonFly does not have aout. When/if they implement a new | |
| # versioning mechanism, adjust this. | |
| @@ -12197,7 +13310,7 @@ | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| ;; | |
| - freebsd*) # from 4.6 on | |
| + *) # from 4.6 on, and DragonFly | |
| shlibpath_overrides_runpath=yes | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -12260,7 +13373,7 @@ | |
| postinstall_cmds='chmod 555 $lib' | |
| ;; | |
| -interix3*) | |
| +interix[3-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -12315,7 +13428,7 @@ | |
| ;; | |
| # This must be Linux ELF. | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -12329,31 +13442,10 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # find out which ABI we are using | |
| - libsuff= | |
| - case "$host_cpu" in | |
| - x86_64*|s390x*|powerpc64*) | |
| - echo '#line 12336 "configure"' > conftest.$ac_ext | |
| - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; then | |
| - case `/usr/bin/file conftest.$ac_objext` in | |
| - *64-bit*) | |
| - libsuff=64 | |
| - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| - ;; | |
| - esac | |
| - fi | |
| - rm -rf conftest* | |
| - ;; | |
| - esac | |
| - | |
| # Append ld.so.conf contents to the search path | |
| if test -f /etc/ld.so.conf; then | |
| - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
| fi | |
| # We used to test for /lib/ld.so.1 and disable shared libraries on | |
| @@ -12365,7 +13457,7 @@ | |
| dynamic_linker='GNU/Linux ld.so' | |
| ;; | |
| -knetbsd*-gnu) | |
| +netbsdelf*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -12374,7 +13466,7 @@ | |
| shlibpath_var=LD_LIBRARY_PATH | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| + dynamic_linker='NetBSD ld.elf_so' | |
| ;; | |
| netbsd*) | |
| @@ -12458,6 +13550,10 @@ | |
| sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | |
| ;; | |
| +rdos*) | |
| + dynamic_linker=no | |
| + ;; | |
| + | |
| solaris*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| @@ -12550,17 +13646,32 @@ | |
| dynamic_linker=no | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| -echo "${ECHO_T}$dynamic_linker" >&6 | |
| +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| +echo "${ECHO_T}$dynamic_linker" >&6; } | |
| test "$dynamic_linker" = no && can_build_shared=no | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" | |
| +fi | |
| + | |
| +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" | |
| +fi | |
| + | |
| +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" | |
| + | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | |
| hardcode_action_CXX= | |
| if test -n "$hardcode_libdir_flag_spec_CXX" || \ | |
| test -n "$runpath_var_CXX" || \ | |
| @@ -12584,8 +13695,8 @@ | |
| # directories. | |
| hardcode_action_CXX=unsupported | |
| fi | |
| -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 | |
| -echo "${ECHO_T}$hardcode_action_CXX" >&6 | |
| +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 | |
| +echo "${ECHO_T}$hardcode_action_CXX" >&6; } | |
| if test "$hardcode_action_CXX" = relink; then | |
| # Fast installation is not supported | |
| @@ -12637,6 +13748,7 @@ | |
| predeps_CXX \ | |
| postdeps_CXX \ | |
| compiler_lib_search_path_CXX \ | |
| + compiler_lib_search_dirs_CXX \ | |
| archive_cmds_CXX \ | |
| archive_expsym_cmds_CXX \ | |
| postinstall_cmds_CXX \ | |
| @@ -12652,6 +13764,7 @@ | |
| module_cmds_CXX \ | |
| module_expsym_cmds_CXX \ | |
| lt_cv_prog_compiler_c_o_CXX \ | |
| + fix_srcfile_path_CXX \ | |
| exclude_expsyms_CXX \ | |
| include_expsyms_CXX; do | |
| @@ -12884,6 +13997,10 @@ | |
| # shared library. | |
| postdeps=$lt_postdeps_CXX | |
| +# The directories searched by this compiler when creating a shared | |
| +# library | |
| +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX | |
| + | |
| # The library search path used internally by the compiler when linking | |
| # a shared library. | |
| compiler_lib_search_path=$lt_compiler_lib_search_path_CXX | |
| @@ -12972,7 +14089,7 @@ | |
| sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Fix the shell variable \$srcfile for the compiler. | |
| -fix_srcfile_path="$fix_srcfile_path_CXX" | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| # Set to yes if exported symbols are required. | |
| always_export_symbols=$always_export_symbols_CXX | |
| @@ -13063,10 +14180,17 @@ | |
| objext_F77=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code=" subroutine t\n return\n end\n" | |
| +lt_simple_compile_test_code="\ | |
| + subroutine t | |
| + return | |
| + end | |
| +" | |
| # Code to be used in simple link tests | |
| -lt_simple_link_test_code=" program t\n end\n" | |
| +lt_simple_link_test_code="\ | |
| + program t | |
| + end | |
| +" | |
| # ltmain only uses $CC for tagged configurations so make sure $CC is set. | |
| @@ -13082,16 +14206,16 @@ | |
| # save warnings/boilerplate of simple test code | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_compiler_boilerplate=`cat conftest.err` | |
| $rm conftest* | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_link_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_link_test_code" >conftest.$ac_ext | |
| eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_linker_boilerplate=`cat conftest.err` | |
| -$rm conftest* | |
| +$rm -r conftest* | |
| # Allow CC to be a program name with arguments. | |
| @@ -13110,13 +14234,13 @@ | |
| cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` | |
| -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | |
| -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 | |
| -echo "$as_me:$LINENO: result: $can_build_shared" >&5 | |
| -echo "${ECHO_T}$can_build_shared" >&6 | |
| +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 | |
| +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } | |
| +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 | |
| +echo "${ECHO_T}$can_build_shared" >&6; } | |
| -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | |
| -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 | |
| +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } | |
| test "$can_build_shared" = "no" && enable_shared=no | |
| # On AIX, shared libraries and static libraries use the same namespace, and | |
| @@ -13129,21 +14253,21 @@ | |
| postinstall_cmds='$RANLIB $lib' | |
| fi | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[4-9]*) | |
| if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then | |
| test "$enable_shared" = yes && enable_static=no | |
| fi | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: result: $enable_shared" >&5 | |
| -echo "${ECHO_T}$enable_shared" >&6 | |
| +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 | |
| +echo "${ECHO_T}$enable_shared" >&6; } | |
| -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | |
| -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 | |
| +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } | |
| # Make sure either enable_shared or enable_static is yes. | |
| test "$enable_shared" = yes || enable_static=yes | |
| -echo "$as_me:$LINENO: result: $enable_static" >&5 | |
| -echo "${ECHO_T}$enable_static" >&6 | |
| +{ echo "$as_me:$LINENO: result: $enable_static" >&5 | |
| +echo "${ECHO_T}$enable_static" >&6; } | |
| GCC_F77="$G77" | |
| LD_F77="$LD" | |
| @@ -13152,8 +14276,8 @@ | |
| lt_prog_compiler_pic_F77= | |
| lt_prog_compiler_static_F77= | |
| -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |
| if test "$GCC" = yes; then | |
| lt_prog_compiler_wl_F77='-Wl,' | |
| @@ -13175,13 +14299,15 @@ | |
| lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' | |
| ;; | |
| - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| # PIC is the default for these OSes. | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| + # Although the cygwin gcc ignores -fPIC, still need this for old-style | |
| + # (--disable-auto-import) libraries | |
| lt_prog_compiler_pic_F77='-DDLL_EXPORT' | |
| ;; | |
| @@ -13191,7 +14317,7 @@ | |
| lt_prog_compiler_pic_F77='-fno-common' | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| # Interix 3.x gcc -fpic/-fPIC options generate broken code. | |
| # Instead, we relocate shared libraries at runtime. | |
| ;; | |
| @@ -13249,7 +14375,7 @@ | |
| esac | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| lt_prog_compiler_pic_F77='-DDLL_EXPORT' | |
| @@ -13282,7 +14408,7 @@ | |
| lt_prog_compiler_static_F77='-Bstatic' | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| icc* | ecc*) | |
| lt_prog_compiler_wl_F77='-Wl,' | |
| @@ -13301,6 +14427,22 @@ | |
| # All Alpha code is PIC. | |
| lt_prog_compiler_static_F77='-non_shared' | |
| ;; | |
| + *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C 5.9 | |
| + lt_prog_compiler_pic_F77='-KPIC' | |
| + lt_prog_compiler_static_F77='-Bstatic' | |
| + lt_prog_compiler_wl_F77='-Wl,' | |
| + ;; | |
| + *Sun\ F*) | |
| + # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| + lt_prog_compiler_pic_F77='-KPIC' | |
| + lt_prog_compiler_static_F77='-Bstatic' | |
| + lt_prog_compiler_wl_F77='' | |
| + ;; | |
| + esac | |
| + ;; | |
| esac | |
| ;; | |
| @@ -13310,6 +14452,10 @@ | |
| lt_prog_compiler_static_F77='-non_shared' | |
| ;; | |
| + rdos*) | |
| + lt_prog_compiler_static_F77='-non_shared' | |
| + ;; | |
| + | |
| solaris*) | |
| lt_prog_compiler_pic_F77='-KPIC' | |
| lt_prog_compiler_static_F77='-Bstatic' | |
| @@ -13362,22 +14508,22 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 | |
| +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| # | |
| if test -n "$lt_prog_compiler_pic_F77"; then | |
| -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | |
| -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 | |
| +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_pic_works_F77=no | |
| + lt_cv_prog_compiler_pic_works_F77=no | |
| ac_outfile=conftest.$ac_objext | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="$lt_prog_compiler_pic_F77" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| # (2) before a word containing "conftest.", or (3) at the end. | |
| @@ -13388,27 +14534,27 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:13391: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:14537: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>conftest.err) | |
| ac_status=$? | |
| cat conftest.err >&5 | |
| - echo "$as_me:13395: \$? = $ac_status" >&5 | |
| + echo "$as_me:14541: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s "$ac_outfile"; then | |
| # The compiler can only warn and ignore the option if not recognized | |
| # So say no if there are warnings other than the usual output. | |
| $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_pic_works_F77=yes | |
| + lt_cv_prog_compiler_pic_works_F77=yes | |
| fi | |
| fi | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } | |
| -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then | |
| case $lt_prog_compiler_pic_F77 in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; | |
| @@ -13433,15 +14579,15 @@ | |
| # Check to make sure the static flag actually works. | |
| # | |
| wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" | |
| -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_static_works_F77+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_static_works_F77=no | |
| + lt_cv_prog_compiler_static_works_F77=no | |
| save_LDFLAGS="$LDFLAGS" | |
| LDFLAGS="$LDFLAGS $lt_tmp_static_flag" | |
| - printf "$lt_simple_link_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_link_test_code" > conftest.$ac_ext | |
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | |
| # The linker can only warn and ignore the option if not recognized | |
| # So say no if there are warnings | |
| @@ -13451,28 +14597,28 @@ | |
| $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_static_works_F77=yes | |
| + lt_cv_prog_compiler_static_works_F77=yes | |
| fi | |
| else | |
| - lt_prog_compiler_static_works_F77=yes | |
| + lt_cv_prog_compiler_static_works_F77=yes | |
| fi | |
| fi | |
| - $rm conftest* | |
| + $rm -r conftest* | |
| LDFLAGS="$save_LDFLAGS" | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } | |
| -if test x"$lt_prog_compiler_static_works_F77" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static_F77= | |
| fi | |
| -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -13481,7 +14627,7 @@ | |
| mkdir conftest | |
| cd conftest | |
| mkdir out | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="-o out/conftest2.$ac_objext" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| @@ -13492,11 +14638,11 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:13495: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:14641: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>out/conftest.err) | |
| ac_status=$? | |
| cat out/conftest.err >&5 | |
| - echo "$as_me:13499: \$? = $ac_status" >&5 | |
| + echo "$as_me:14645: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
| then | |
| # The compiler can only warn and ignore the option if not recognized | |
| @@ -13518,23 +14664,23 @@ | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } | |
| hard_links="nottested" | |
| if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then | |
| # do not overwrite the value of need_locks provided by the user | |
| - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | |
| hard_links=yes | |
| $rm conftest* | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| touch conftest.a | |
| ln conftest.a conftest.b 2>&5 || hard_links=no | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| - echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| -echo "${ECHO_T}$hard_links" >&6 | |
| + { echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| +echo "${ECHO_T}$hard_links" >&6; } | |
| if test "$hard_links" = no; then | |
| { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | |
| echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | |
| @@ -13544,8 +14690,8 @@ | |
| need_locks=no | |
| fi | |
| -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | |
| runpath_var= | |
| allow_undefined_flag_F77= | |
| @@ -13576,12 +14722,13 @@ | |
| # it will be wrapped by ` (' and `)$', so one must not match beginning or | |
| # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', | |
| # as well as any symbol that contains `d'. | |
| - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" | |
| + exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | |
| # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out | |
| # platforms (ab)use it in PIC code, but their linkers get confused if | |
| # the symbol is explicitly referenced. Since portable code cannot | |
| # rely on this symbol name, it's probably fine to never include it in | |
| # preloaded symbol tables. | |
| + # Exclude shared library initialization/finalization symbols. | |
| extract_expsyms_cmds= | |
| # Just being paranoid about ensuring that cc_basename is set. | |
| for cc_temp in $compiler""; do | |
| @@ -13640,7 +14787,7 @@ | |
| # See if GNU ld supports shared libraries. | |
| case $host_os in | |
| - aix3* | aix4* | aix5*) | |
| + aix[3-9]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| if test "$host_cpu" != ia64; then | |
| ld_shlibs_F77=no | |
| @@ -13688,7 +14835,7 @@ | |
| allow_undefined_flag_F77=unsupported | |
| always_export_symbols_F77=no | |
| enable_shared_with_static_runtimes_F77=yes | |
| - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' | |
| + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then | |
| archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | |
| @@ -13706,7 +14853,7 @@ | |
| fi | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| hardcode_direct_F77=no | |
| hardcode_shlibpath_var_F77=no | |
| hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' | |
| @@ -13721,7 +14868,7 @@ | |
| archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | |
| ;; | |
| - linux*) | |
| + gnu* | linux* | k*bsd*-gnu) | |
| if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
| tmp_addflag= | |
| case $cc_basename,$host_cpu in | |
| @@ -13739,20 +14886,30 @@ | |
| ifc* | ifort*) # Intel Fortran compiler | |
| tmp_addflag=' -nofor_main' ;; | |
| esac | |
| - archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) # Sun C 5.9 | |
| + whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' | |
| + tmp_sharedflag='-G' ;; | |
| + *Sun\ F*) # Sun Fortran 8.3 | |
| + tmp_sharedflag='-G' ;; | |
| + *) | |
| + tmp_sharedflag='-shared' ;; | |
| + esac | |
| + archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| if test $supports_anon_versioning = yes; then | |
| archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ | |
| cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | |
| $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
| - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| fi | |
| + link_all_deplibs_F77=no | |
| else | |
| ld_shlibs_F77=no | |
| fi | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
| wlarc= | |
| @@ -13850,7 +15007,7 @@ | |
| fi | |
| ;; | |
| - aix4* | aix5*) | |
| + aix[4-9]*) | |
| if test "$host_cpu" = ia64; then | |
| # On IA64, the linker does run time linking by default, so we don't | |
| # have to do anything special. | |
| @@ -13870,7 +15027,7 @@ | |
| # Test if we are trying to use run time linking or normal | |
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we | |
| # need to do runtime linking. | |
| - case $host_os in aix4.[23]|aix4.[23].*|aix5*) | |
| + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | |
| aix_use_runtimelinking=yes | |
| @@ -13904,7 +15061,7 @@ | |
| strings "$collect2name" | grep resolve_lib_name >/dev/null | |
| then | |
| # We have reworked collect2 | |
| - hardcode_direct_F77=yes | |
| + : | |
| else | |
| # We have old collect2 | |
| hardcode_direct_F77=unsupported | |
| @@ -13950,39 +15107,44 @@ | |
| end | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_f77_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_f77_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -14001,39 +15163,44 @@ | |
| end | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_f77_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_f77_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -14079,7 +15246,7 @@ | |
| # The linker will automatically build a .lib file if we build a DLL. | |
| old_archive_From_new_cmds_F77='true' | |
| # FIXME: Should let the user specify the lib program. | |
| - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' | |
| + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| fix_srcfile_path_F77='`cygpath -w "$srcfile"`' | |
| enable_shared_with_static_runtimes_F77=yes | |
| ;; | |
| @@ -14112,19 +15279,18 @@ | |
| link_all_deplibs_F77=yes | |
| if test "$GCC" = yes ; then | |
| output_verbose_link_cmd='echo' | |
| - archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | |
| + module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | |
| + archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" | |
| else | |
| case $cc_basename in | |
| xlc*) | |
| output_verbose_link_cmd='echo' | |
| - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' | |
| + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' | |
| module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| ;; | |
| *) | |
| @@ -14164,7 +15330,7 @@ | |
| ;; | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| hardcode_libdir_flag_spec_F77='-R$libdir' | |
| hardcode_direct_F77=yes | |
| @@ -14266,7 +15432,7 @@ | |
| link_all_deplibs_F77=yes | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
| else | |
| @@ -14286,24 +15452,28 @@ | |
| ;; | |
| openbsd*) | |
| - hardcode_direct_F77=yes | |
| - hardcode_shlibpath_var_F77=no | |
| - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' | |
| - export_dynamic_flag_spec_F77='${wl}-E' | |
| + if test -f /usr/libexec/ld.so; then | |
| + hardcode_direct_F77=yes | |
| + hardcode_shlibpath_var_F77=no | |
| + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' | |
| + export_dynamic_flag_spec_F77='${wl}-E' | |
| + else | |
| + case $host_os in | |
| + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | |
| + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| + hardcode_libdir_flag_spec_F77='-R$libdir' | |
| + ;; | |
| + *) | |
| + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' | |
| + ;; | |
| + esac | |
| + fi | |
| else | |
| - case $host_os in | |
| - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | |
| - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| - hardcode_libdir_flag_spec_F77='-R$libdir' | |
| - ;; | |
| - *) | |
| - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' | |
| - ;; | |
| - esac | |
| + ld_shlibs_F77=no | |
| fi | |
| ;; | |
| @@ -14362,17 +15532,16 @@ | |
| case $host_os in | |
| solaris2.[0-5] | solaris2.[0-5].*) ;; | |
| *) | |
| - # The compiler driver will combine linker options so we | |
| - # cannot just pass the convience library names through | |
| - # without $wl, iff we do not link with $LD. | |
| - # Luckily, gcc supports the same syntax we need for Sun Studio. | |
| + # The compiler driver will combine and reorder linker options, | |
| + # but understands `-z linker_flag'. GCC discards it without `$wl', | |
| + # but is careful enough not to reorder. | |
| # Supported since Solaris 2.6 (maybe 2.5.1?) | |
| - case $wlarc in | |
| - '') | |
| - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; | |
| - *) | |
| - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; | |
| - esac ;; | |
| + if test "$GCC" = yes; then | |
| + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | |
| + else | |
| + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' | |
| + fi | |
| + ;; | |
| esac | |
| link_all_deplibs_F77=yes | |
| ;; | |
| @@ -14429,7 +15598,7 @@ | |
| fi | |
| ;; | |
| - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) | |
| + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) | |
| no_undefined_flag_F77='${wl}-z,text' | |
| archive_cmds_need_lc_F77=no | |
| hardcode_shlibpath_var_F77=no | |
| @@ -14482,8 +15651,8 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 | |
| -echo "${ECHO_T}$ld_shlibs_F77" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 | |
| +echo "${ECHO_T}$ld_shlibs_F77" >&6; } | |
| test "$ld_shlibs_F77" = no && can_build_shared=no | |
| # | |
| @@ -14503,10 +15672,10 @@ | |
| # Test whether the compiler implicitly links with -lc since on some | |
| # systems, -lgcc has to come before -lc. If gcc already passes -lc | |
| # to ld, don't add -lc before -lgcc. | |
| - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | |
| $rm conftest* | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -14541,16 +15710,16 @@ | |
| cat conftest.err 1>&5 | |
| fi | |
| $rm conftest* | |
| - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 | |
| -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 | |
| + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 | |
| +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } | |
| ;; | |
| esac | |
| fi | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| @@ -14564,20 +15733,7 @@ | |
| version_type=none | |
| dynamic_linker="$host_os ld.so" | |
| sys_lib_dlsearch_path_spec="/lib /usr/lib" | |
| -if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | |
| - # if the path contains ";" then we assume it to be the separator | |
| - # otherwise default to the standard path separator (i.e. ":") - it is | |
| - # assumed that no part of a normal pathname contains ";" but that should | |
| - # okay in the real world where ";" in dirpaths is itself problematic. | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | |
| - else | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| - fi | |
| -else | |
| - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | |
| -fi | |
| + | |
| need_lib_prefix=unknown | |
| hardcode_into_libs=no | |
| @@ -14595,7 +15751,7 @@ | |
| soname_spec='${libname}${release}${shared_ext}$major' | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[4-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -14734,12 +15890,7 @@ | |
| shlibpath_overrides_runpath=yes | |
| shlibpath_var=DYLD_LIBRARY_PATH | |
| shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' | |
| - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. | |
| - if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| - else | |
| - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| - fi | |
| + | |
| sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' | |
| ;; | |
| @@ -14756,18 +15907,6 @@ | |
| dynamic_linker=no | |
| ;; | |
| -kfreebsd*-gnu) | |
| - version_type=linux | |
| - need_lib_prefix=no | |
| - need_version=no | |
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| - soname_spec='${libname}${release}${shared_ext}$major' | |
| - shlibpath_var=LD_LIBRARY_PATH | |
| - shlibpath_overrides_runpath=no | |
| - hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| - ;; | |
| - | |
| freebsd* | dragonfly*) | |
| # DragonFly does not have aout. When/if they implement a new | |
| # versioning mechanism, adjust this. | |
| @@ -14805,7 +15944,7 @@ | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| ;; | |
| - freebsd*) # from 4.6 on | |
| + *) # from 4.6 on, and DragonFly | |
| shlibpath_overrides_runpath=yes | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -14868,7 +16007,7 @@ | |
| postinstall_cmds='chmod 555 $lib' | |
| ;; | |
| -interix3*) | |
| +interix[3-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -14923,7 +16062,7 @@ | |
| ;; | |
| # This must be Linux ELF. | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -14937,31 +16076,10 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # find out which ABI we are using | |
| - libsuff= | |
| - case "$host_cpu" in | |
| - x86_64*|s390x*|powerpc64*) | |
| - echo '#line 14944 "configure"' > conftest.$ac_ext | |
| - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; then | |
| - case `/usr/bin/file conftest.$ac_objext` in | |
| - *64-bit*) | |
| - libsuff=64 | |
| - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| - ;; | |
| - esac | |
| - fi | |
| - rm -rf conftest* | |
| - ;; | |
| - esac | |
| - | |
| # Append ld.so.conf contents to the search path | |
| if test -f /etc/ld.so.conf; then | |
| - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
| fi | |
| # We used to test for /lib/ld.so.1 and disable shared libraries on | |
| @@ -14973,7 +16091,7 @@ | |
| dynamic_linker='GNU/Linux ld.so' | |
| ;; | |
| -knetbsd*-gnu) | |
| +netbsdelf*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -14982,7 +16100,7 @@ | |
| shlibpath_var=LD_LIBRARY_PATH | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| + dynamic_linker='NetBSD ld.elf_so' | |
| ;; | |
| netbsd*) | |
| @@ -15066,6 +16184,10 @@ | |
| sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | |
| ;; | |
| +rdos*) | |
| + dynamic_linker=no | |
| + ;; | |
| + | |
| solaris*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| @@ -15158,17 +16280,32 @@ | |
| dynamic_linker=no | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| -echo "${ECHO_T}$dynamic_linker" >&6 | |
| +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| +echo "${ECHO_T}$dynamic_linker" >&6; } | |
| test "$dynamic_linker" = no && can_build_shared=no | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" | |
| +fi | |
| + | |
| +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" | |
| +fi | |
| + | |
| +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" | |
| + | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | |
| hardcode_action_F77= | |
| if test -n "$hardcode_libdir_flag_spec_F77" || \ | |
| test -n "$runpath_var_F77" || \ | |
| @@ -15192,8 +16329,8 @@ | |
| # directories. | |
| hardcode_action_F77=unsupported | |
| fi | |
| -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | |
| -echo "${ECHO_T}$hardcode_action_F77" >&6 | |
| +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 | |
| +echo "${ECHO_T}$hardcode_action_F77" >&6; } | |
| if test "$hardcode_action_F77" = relink; then | |
| # Fast installation is not supported | |
| @@ -15245,6 +16382,7 @@ | |
| predeps_F77 \ | |
| postdeps_F77 \ | |
| compiler_lib_search_path_F77 \ | |
| + compiler_lib_search_dirs_F77 \ | |
| archive_cmds_F77 \ | |
| archive_expsym_cmds_F77 \ | |
| postinstall_cmds_F77 \ | |
| @@ -15260,6 +16398,7 @@ | |
| module_cmds_F77 \ | |
| module_expsym_cmds_F77 \ | |
| lt_cv_prog_compiler_c_o_F77 \ | |
| + fix_srcfile_path_F77 \ | |
| exclude_expsyms_F77 \ | |
| include_expsyms_F77; do | |
| @@ -15492,6 +16631,10 @@ | |
| # shared library. | |
| postdeps=$lt_postdeps_F77 | |
| +# The directories searched by this compiler when creating a shared | |
| +# library | |
| +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 | |
| + | |
| # The library search path used internally by the compiler when linking | |
| # a shared library. | |
| compiler_lib_search_path=$lt_compiler_lib_search_path_F77 | |
| @@ -15580,7 +16723,7 @@ | |
| sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Fix the shell variable \$srcfile for the compiler. | |
| -fix_srcfile_path="$fix_srcfile_path_F77" | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| # Set to yes if exported symbols are required. | |
| always_export_symbols=$always_export_symbols_F77 | |
| @@ -15630,7 +16773,6 @@ | |
| if test -n "$GCJ" && test "X$GCJ" != "Xno"; then | |
| - | |
| # Source file extension for Java test sources. | |
| ac_ext=java | |
| @@ -15639,10 +16781,10 @@ | |
| objext_GCJ=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code="class foo {}\n" | |
| +lt_simple_compile_test_code="class foo {}" | |
| # Code to be used in simple link tests | |
| -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' | |
| +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' | |
| # ltmain only uses $CC for tagged configurations so make sure $CC is set. | |
| @@ -15658,16 +16800,16 @@ | |
| # save warnings/boilerplate of simple test code | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_compiler_boilerplate=`cat conftest.err` | |
| $rm conftest* | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_link_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_link_test_code" >conftest.$ac_ext | |
| eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_linker_boilerplate=`cat conftest.err` | |
| -$rm conftest* | |
| +$rm -r conftest* | |
| # Allow CC to be a program name with arguments. | |
| @@ -15698,14 +16840,14 @@ | |
| lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' | |
| -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 | |
| +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| lt_cv_prog_compiler_rtti_exceptions=no | |
| ac_outfile=conftest.$ac_objext | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="-fno-rtti -fno-exceptions" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| # (2) before a word containing "conftest.", or (3) at the end. | |
| @@ -15716,11 +16858,11 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:15719: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:16861: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>conftest.err) | |
| ac_status=$? | |
| cat conftest.err >&5 | |
| - echo "$as_me:15723: \$? = $ac_status" >&5 | |
| + echo "$as_me:16865: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s "$ac_outfile"; then | |
| # The compiler can only warn and ignore the option if not recognized | |
| # So say no if there are warnings other than the usual output. | |
| @@ -15733,8 +16875,8 @@ | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } | |
| if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then | |
| lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" | |
| @@ -15748,8 +16890,8 @@ | |
| lt_prog_compiler_pic_GCJ= | |
| lt_prog_compiler_static_GCJ= | |
| -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 | |
| +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } | |
| if test "$GCC" = yes; then | |
| lt_prog_compiler_wl_GCJ='-Wl,' | |
| @@ -15771,14 +16913,16 @@ | |
| lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' | |
| ;; | |
| - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | |
| # PIC is the default for these OSes. | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' | |
| + # Although the cygwin gcc ignores -fPIC, still need this for old-style | |
| + # (--disable-auto-import) libraries | |
| + | |
| ;; | |
| darwin* | rhapsody*) | |
| @@ -15787,7 +16931,7 @@ | |
| lt_prog_compiler_pic_GCJ='-fno-common' | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| # Interix 3.x gcc -fpic/-fPIC options generate broken code. | |
| # Instead, we relocate shared libraries at runtime. | |
| ;; | |
| @@ -15845,10 +16989,10 @@ | |
| esac | |
| ;; | |
| - mingw* | pw32* | os2*) | |
| + mingw* | cygwin* | pw32* | os2*) | |
| # This hack is so that the source file can tell whether it is being | |
| # built for inclusion in a dll (and should export symbols for example). | |
| - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' | |
| + | |
| ;; | |
| hpux9* | hpux10* | hpux11*) | |
| @@ -15878,7 +17022,7 @@ | |
| lt_prog_compiler_static_GCJ='-Bstatic' | |
| ;; | |
| - linux*) | |
| + linux* | k*bsd*-gnu) | |
| case $cc_basename in | |
| icc* | ecc*) | |
| lt_prog_compiler_wl_GCJ='-Wl,' | |
| @@ -15897,6 +17041,22 @@ | |
| # All Alpha code is PIC. | |
| lt_prog_compiler_static_GCJ='-non_shared' | |
| ;; | |
| + *) | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) | |
| + # Sun C 5.9 | |
| + lt_prog_compiler_pic_GCJ='-KPIC' | |
| + lt_prog_compiler_static_GCJ='-Bstatic' | |
| + lt_prog_compiler_wl_GCJ='-Wl,' | |
| + ;; | |
| + *Sun\ F*) | |
| + # Sun Fortran 8.3 passes all unrecognized flags to the linker | |
| + lt_prog_compiler_pic_GCJ='-KPIC' | |
| + lt_prog_compiler_static_GCJ='-Bstatic' | |
| + lt_prog_compiler_wl_GCJ='' | |
| + ;; | |
| + esac | |
| + ;; | |
| esac | |
| ;; | |
| @@ -15906,6 +17066,10 @@ | |
| lt_prog_compiler_static_GCJ='-non_shared' | |
| ;; | |
| + rdos*) | |
| + lt_prog_compiler_static_GCJ='-non_shared' | |
| + ;; | |
| + | |
| solaris*) | |
| lt_prog_compiler_pic_GCJ='-KPIC' | |
| lt_prog_compiler_static_GCJ='-Bstatic' | |
| @@ -15958,22 +17122,22 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 | |
| +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } | |
| # | |
| # Check to make sure the PIC flag actually works. | |
| # | |
| if test -n "$lt_prog_compiler_pic_GCJ"; then | |
| -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 | |
| -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 | |
| +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_pic_works_GCJ=no | |
| + lt_cv_prog_compiler_pic_works_GCJ=no | |
| ac_outfile=conftest.$ac_objext | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="$lt_prog_compiler_pic_GCJ" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| # (2) before a word containing "conftest.", or (3) at the end. | |
| @@ -15984,27 +17148,27 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:15987: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:17151: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>conftest.err) | |
| ac_status=$? | |
| cat conftest.err >&5 | |
| - echo "$as_me:15991: \$? = $ac_status" >&5 | |
| + echo "$as_me:17155: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s "$ac_outfile"; then | |
| # The compiler can only warn and ignore the option if not recognized | |
| # So say no if there are warnings other than the usual output. | |
| $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_pic_works_GCJ=yes | |
| + lt_cv_prog_compiler_pic_works_GCJ=yes | |
| fi | |
| fi | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } | |
| -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then | |
| case $lt_prog_compiler_pic_GCJ in | |
| "" | " "*) ;; | |
| *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; | |
| @@ -16029,15 +17193,15 @@ | |
| # Check to make sure the static flag actually works. | |
| # | |
| wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" | |
| -echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6 | |
| -if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 | |
| +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } | |
| +if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - lt_prog_compiler_static_works_GCJ=no | |
| + lt_cv_prog_compiler_static_works_GCJ=no | |
| save_LDFLAGS="$LDFLAGS" | |
| LDFLAGS="$LDFLAGS $lt_tmp_static_flag" | |
| - printf "$lt_simple_link_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_link_test_code" > conftest.$ac_ext | |
| if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then | |
| # The linker can only warn and ignore the option if not recognized | |
| # So say no if there are warnings | |
| @@ -16047,28 +17211,28 @@ | |
| $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp | |
| $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 | |
| if diff conftest.exp conftest.er2 >/dev/null; then | |
| - lt_prog_compiler_static_works_GCJ=yes | |
| + lt_cv_prog_compiler_static_works_GCJ=yes | |
| fi | |
| else | |
| - lt_prog_compiler_static_works_GCJ=yes | |
| + lt_cv_prog_compiler_static_works_GCJ=yes | |
| fi | |
| fi | |
| - $rm conftest* | |
| + $rm -r conftest* | |
| LDFLAGS="$save_LDFLAGS" | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5 | |
| -echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } | |
| -if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then | |
| +if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then | |
| : | |
| else | |
| lt_prog_compiler_static_GCJ= | |
| fi | |
| -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 | |
| +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } | |
| if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -16077,7 +17241,7 @@ | |
| mkdir conftest | |
| cd conftest | |
| mkdir out | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| lt_compiler_flag="-o out/conftest2.$ac_objext" | |
| # Insert the option either (1) after the last *FLAGS variable, or | |
| @@ -16088,11 +17252,11 @@ | |
| -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | |
| -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | |
| -e 's:$: $lt_compiler_flag:'` | |
| - (eval echo "\"\$as_me:16091: $lt_compile\"" >&5) | |
| + (eval echo "\"\$as_me:17255: $lt_compile\"" >&5) | |
| (eval "$lt_compile" 2>out/conftest.err) | |
| ac_status=$? | |
| cat out/conftest.err >&5 | |
| - echo "$as_me:16095: \$? = $ac_status" >&5 | |
| + echo "$as_me:17259: \$? = $ac_status" >&5 | |
| if (exit $ac_status) && test -s out/conftest2.$ac_objext | |
| then | |
| # The compiler can only warn and ignore the option if not recognized | |
| @@ -16114,23 +17278,23 @@ | |
| $rm conftest* | |
| fi | |
| -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 | |
| -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 | |
| +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 | |
| +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } | |
| hard_links="nottested" | |
| if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then | |
| # do not overwrite the value of need_locks provided by the user | |
| - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 | |
| +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } | |
| hard_links=yes | |
| $rm conftest* | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| touch conftest.a | |
| ln conftest.a conftest.b 2>&5 || hard_links=no | |
| ln conftest.a conftest.b 2>/dev/null && hard_links=no | |
| - echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| -echo "${ECHO_T}$hard_links" >&6 | |
| + { echo "$as_me:$LINENO: result: $hard_links" >&5 | |
| +echo "${ECHO_T}$hard_links" >&6; } | |
| if test "$hard_links" = no; then | |
| { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 | |
| echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} | |
| @@ -16140,8 +17304,8 @@ | |
| need_locks=no | |
| fi | |
| -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 | |
| +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } | |
| runpath_var= | |
| allow_undefined_flag_GCJ= | |
| @@ -16172,12 +17336,13 @@ | |
| # it will be wrapped by ` (' and `)$', so one must not match beginning or | |
| # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', | |
| # as well as any symbol that contains `d'. | |
| - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" | |
| + exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' | |
| # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out | |
| # platforms (ab)use it in PIC code, but their linkers get confused if | |
| # the symbol is explicitly referenced. Since portable code cannot | |
| # rely on this symbol name, it's probably fine to never include it in | |
| # preloaded symbol tables. | |
| + # Exclude shared library initialization/finalization symbols. | |
| extract_expsyms_cmds= | |
| # Just being paranoid about ensuring that cc_basename is set. | |
| for cc_temp in $compiler""; do | |
| @@ -16236,7 +17401,7 @@ | |
| # See if GNU ld supports shared libraries. | |
| case $host_os in | |
| - aix3* | aix4* | aix5*) | |
| + aix[3-9]*) | |
| # On AIX/PPC, the GNU linker is very broken | |
| if test "$host_cpu" != ia64; then | |
| ld_shlibs_GCJ=no | |
| @@ -16284,7 +17449,7 @@ | |
| allow_undefined_flag_GCJ=unsupported | |
| always_export_symbols_GCJ=no | |
| enable_shared_with_static_runtimes_GCJ=yes | |
| - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' | |
| + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' | |
| if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then | |
| archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' | |
| @@ -16302,7 +17467,7 @@ | |
| fi | |
| ;; | |
| - interix3*) | |
| + interix[3-9]*) | |
| hardcode_direct_GCJ=no | |
| hardcode_shlibpath_var_GCJ=no | |
| hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' | |
| @@ -16317,7 +17482,7 @@ | |
| archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' | |
| ;; | |
| - linux*) | |
| + gnu* | linux* | k*bsd*-gnu) | |
| if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then | |
| tmp_addflag= | |
| case $cc_basename,$host_cpu in | |
| @@ -16335,20 +17500,30 @@ | |
| ifc* | ifort*) # Intel Fortran compiler | |
| tmp_addflag=' -nofor_main' ;; | |
| esac | |
| - archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| + case `$CC -V 2>&1 | sed 5q` in | |
| + *Sun\ C*) # Sun C 5.9 | |
| + whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' | |
| + tmp_sharedflag='-G' ;; | |
| + *Sun\ F*) # Sun Fortran 8.3 | |
| + tmp_sharedflag='-G' ;; | |
| + *) | |
| + tmp_sharedflag='-shared' ;; | |
| + esac | |
| + archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' | |
| if test $supports_anon_versioning = yes; then | |
| archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ | |
| cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ | |
| $echo "local: *; };" >> $output_objdir/$libname.ver~ | |
| - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' | |
| fi | |
| + link_all_deplibs_GCJ=no | |
| else | |
| ld_shlibs_GCJ=no | |
| fi | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' | |
| wlarc= | |
| @@ -16446,7 +17621,7 @@ | |
| fi | |
| ;; | |
| - aix4* | aix5*) | |
| + aix[4-9]*) | |
| if test "$host_cpu" = ia64; then | |
| # On IA64, the linker does run time linking by default, so we don't | |
| # have to do anything special. | |
| @@ -16466,7 +17641,7 @@ | |
| # Test if we are trying to use run time linking or normal | |
| # AIX style linking. If -brtl is somewhere in LDFLAGS, we | |
| # need to do runtime linking. | |
| - case $host_os in aix4.[23]|aix4.[23].*|aix5*) | |
| + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) | |
| for ld_flag in $LDFLAGS; do | |
| if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then | |
| aix_use_runtimelinking=yes | |
| @@ -16500,7 +17675,7 @@ | |
| strings "$collect2name" | grep resolve_lib_name >/dev/null | |
| then | |
| # We have reworked collect2 | |
| - hardcode_direct_GCJ=yes | |
| + : | |
| else | |
| # We have old collect2 | |
| hardcode_direct_GCJ=unsupported | |
| @@ -16556,39 +17731,44 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -16617,39 +17797,44 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - | |
| -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'` | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + | |
| +lt_aix_libpath_sed=' | |
| + /Import File Strings/,/^$/ { | |
| + /^0/ { | |
| + s/^0 *\(.*\)$/\1/ | |
| + p | |
| + } | |
| + }' | |
| +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| # Check for a 64-bit object if we didn't find anything. | |
| -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } | |
| -}'`; fi | |
| +if test -z "$aix_libpath"; then | |
| + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` | |
| +fi | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi | |
| @@ -16695,7 +17880,7 @@ | |
| # The linker will automatically build a .lib file if we build a DLL. | |
| old_archive_From_new_cmds_GCJ='true' | |
| # FIXME: Should let the user specify the lib program. | |
| - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' | |
| + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' | |
| fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' | |
| enable_shared_with_static_runtimes_GCJ=yes | |
| ;; | |
| @@ -16728,19 +17913,18 @@ | |
| link_all_deplibs_GCJ=yes | |
| if test "$GCC" = yes ; then | |
| output_verbose_link_cmd='echo' | |
| - archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' | |
| - module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| - module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" | |
| + module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" | |
| + archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" | |
| + module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" | |
| else | |
| case $cc_basename in | |
| xlc*) | |
| output_verbose_link_cmd='echo' | |
| - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' | |
| + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' | |
| module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' | |
| # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds | |
| - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' | |
| ;; | |
| *) | |
| @@ -16780,7 +17964,7 @@ | |
| ;; | |
| # FreeBSD 3 and greater uses gcc -shared to do shared libraries. | |
| - freebsd* | kfreebsd*-gnu | dragonfly*) | |
| + freebsd* | dragonfly*) | |
| archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' | |
| hardcode_libdir_flag_spec_GCJ='-R$libdir' | |
| hardcode_direct_GCJ=yes | |
| @@ -16882,7 +18066,7 @@ | |
| link_all_deplibs_GCJ=yes | |
| ;; | |
| - netbsd*) | |
| + netbsd* | netbsdelf*-gnu) | |
| if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then | |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out | |
| else | |
| @@ -16902,24 +18086,28 @@ | |
| ;; | |
| openbsd*) | |
| - hardcode_direct_GCJ=yes | |
| - hardcode_shlibpath_var_GCJ=no | |
| - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' | |
| - export_dynamic_flag_spec_GCJ='${wl}-E' | |
| + if test -f /usr/libexec/ld.so; then | |
| + hardcode_direct_GCJ=yes | |
| + hardcode_shlibpath_var_GCJ=no | |
| + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then | |
| + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' | |
| + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' | |
| + export_dynamic_flag_spec_GCJ='${wl}-E' | |
| + else | |
| + case $host_os in | |
| + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | |
| + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| + hardcode_libdir_flag_spec_GCJ='-R$libdir' | |
| + ;; | |
| + *) | |
| + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' | |
| + ;; | |
| + esac | |
| + fi | |
| else | |
| - case $host_os in | |
| - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) | |
| - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' | |
| - hardcode_libdir_flag_spec_GCJ='-R$libdir' | |
| - ;; | |
| - *) | |
| - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' | |
| - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' | |
| - ;; | |
| - esac | |
| + ld_shlibs_GCJ=no | |
| fi | |
| ;; | |
| @@ -16978,17 +18166,16 @@ | |
| case $host_os in | |
| solaris2.[0-5] | solaris2.[0-5].*) ;; | |
| *) | |
| - # The compiler driver will combine linker options so we | |
| - # cannot just pass the convience library names through | |
| - # without $wl, iff we do not link with $LD. | |
| - # Luckily, gcc supports the same syntax we need for Sun Studio. | |
| + # The compiler driver will combine and reorder linker options, | |
| + # but understands `-z linker_flag'. GCC discards it without `$wl', | |
| + # but is careful enough not to reorder. | |
| # Supported since Solaris 2.6 (maybe 2.5.1?) | |
| - case $wlarc in | |
| - '') | |
| - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; | |
| - *) | |
| - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; | |
| - esac ;; | |
| + if test "$GCC" = yes; then | |
| + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' | |
| + else | |
| + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' | |
| + fi | |
| + ;; | |
| esac | |
| link_all_deplibs_GCJ=yes | |
| ;; | |
| @@ -17045,7 +18232,7 @@ | |
| fi | |
| ;; | |
| - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) | |
| + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) | |
| no_undefined_flag_GCJ='${wl}-z,text' | |
| archive_cmds_need_lc_GCJ=no | |
| hardcode_shlibpath_var_GCJ=no | |
| @@ -17098,8 +18285,8 @@ | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 | |
| -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 | |
| +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } | |
| test "$ld_shlibs_GCJ" = no && can_build_shared=no | |
| # | |
| @@ -17119,10 +18306,10 @@ | |
| # Test whether the compiler implicitly links with -lc since on some | |
| # systems, -lgcc has to come before -lc. If gcc already passes -lc | |
| # to ld, don't add -lc before -lgcc. | |
| - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 | |
| +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } | |
| $rm conftest* | |
| - printf "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| + echo "$lt_simple_compile_test_code" > conftest.$ac_ext | |
| if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| (eval $ac_compile) 2>&5 | |
| @@ -17157,16 +18344,16 @@ | |
| cat conftest.err 1>&5 | |
| fi | |
| $rm conftest* | |
| - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 | |
| -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 | |
| + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 | |
| +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } | |
| ;; | |
| esac | |
| fi | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 | |
| +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } | |
| library_names_spec= | |
| libname_spec='lib$name' | |
| soname_spec= | |
| @@ -17180,20 +18367,7 @@ | |
| version_type=none | |
| dynamic_linker="$host_os ld.so" | |
| sys_lib_dlsearch_path_spec="/lib /usr/lib" | |
| -if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` | |
| - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then | |
| - # if the path contains ";" then we assume it to be the separator | |
| - # otherwise default to the standard path separator (i.e. ":") - it is | |
| - # assumed that no part of a normal pathname contains ";" but that should | |
| - # okay in the real world where ";" in dirpaths is itself problematic. | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` | |
| - else | |
| - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` | |
| - fi | |
| -else | |
| - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" | |
| -fi | |
| + | |
| need_lib_prefix=unknown | |
| hardcode_into_libs=no | |
| @@ -17211,7 +18385,7 @@ | |
| soname_spec='${libname}${release}${shared_ext}$major' | |
| ;; | |
| -aix4* | aix5*) | |
| +aix[4-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -17350,12 +18524,7 @@ | |
| shlibpath_overrides_runpath=yes | |
| shlibpath_var=DYLD_LIBRARY_PATH | |
| shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' | |
| - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. | |
| - if test "$GCC" = yes; then | |
| - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` | |
| - else | |
| - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' | |
| - fi | |
| + | |
| sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' | |
| ;; | |
| @@ -17372,18 +18541,6 @@ | |
| dynamic_linker=no | |
| ;; | |
| -kfreebsd*-gnu) | |
| - version_type=linux | |
| - need_lib_prefix=no | |
| - need_version=no | |
| - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' | |
| - soname_spec='${libname}${release}${shared_ext}$major' | |
| - shlibpath_var=LD_LIBRARY_PATH | |
| - shlibpath_overrides_runpath=no | |
| - hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| - ;; | |
| - | |
| freebsd* | dragonfly*) | |
| # DragonFly does not have aout. When/if they implement a new | |
| # versioning mechanism, adjust this. | |
| @@ -17421,7 +18578,7 @@ | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| ;; | |
| - freebsd*) # from 4.6 on | |
| + *) # from 4.6 on, and DragonFly | |
| shlibpath_overrides_runpath=yes | |
| hardcode_into_libs=yes | |
| ;; | |
| @@ -17484,7 +18641,7 @@ | |
| postinstall_cmds='chmod 555 $lib' | |
| ;; | |
| -interix3*) | |
| +interix[3-9]*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -17539,7 +18696,7 @@ | |
| ;; | |
| # This must be Linux ELF. | |
| -linux*) | |
| +linux* | k*bsd*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -17553,31 +18710,10 @@ | |
| # before this can be enabled. | |
| hardcode_into_libs=yes | |
| - # find out which ABI we are using | |
| - libsuff= | |
| - case "$host_cpu" in | |
| - x86_64*|s390x*|powerpc64*) | |
| - echo '#line 17560 "configure"' > conftest.$ac_ext | |
| - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; then | |
| - case `/usr/bin/file conftest.$ac_objext` in | |
| - *64-bit*) | |
| - libsuff=64 | |
| - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" | |
| - ;; | |
| - esac | |
| - fi | |
| - rm -rf conftest* | |
| - ;; | |
| - esac | |
| - | |
| # Append ld.so.conf contents to the search path | |
| if test -f /etc/ld.so.conf; then | |
| - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" | |
| + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` | |
| + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" | |
| fi | |
| # We used to test for /lib/ld.so.1 and disable shared libraries on | |
| @@ -17589,7 +18725,7 @@ | |
| dynamic_linker='GNU/Linux ld.so' | |
| ;; | |
| -knetbsd*-gnu) | |
| +netbsdelf*-gnu) | |
| version_type=linux | |
| need_lib_prefix=no | |
| need_version=no | |
| @@ -17598,7 +18734,7 @@ | |
| shlibpath_var=LD_LIBRARY_PATH | |
| shlibpath_overrides_runpath=no | |
| hardcode_into_libs=yes | |
| - dynamic_linker='GNU ld.so' | |
| + dynamic_linker='NetBSD ld.elf_so' | |
| ;; | |
| netbsd*) | |
| @@ -17682,6 +18818,10 @@ | |
| sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" | |
| ;; | |
| +rdos*) | |
| + dynamic_linker=no | |
| + ;; | |
| + | |
| solaris*) | |
| version_type=linux | |
| need_lib_prefix=no | |
| @@ -17774,17 +18914,32 @@ | |
| dynamic_linker=no | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| -echo "${ECHO_T}$dynamic_linker" >&6 | |
| +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 | |
| +echo "${ECHO_T}$dynamic_linker" >&6; } | |
| test "$dynamic_linker" = no && can_build_shared=no | |
| +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" | |
| +fi | |
| + | |
| +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | |
| +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then | |
| + echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| +else | |
| + lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" | |
| +fi | |
| + | |
| +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" | |
| + | |
| variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |
| if test "$GCC" = yes; then | |
| variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | |
| fi | |
| -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 | |
| +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } | |
| hardcode_action_GCJ= | |
| if test -n "$hardcode_libdir_flag_spec_GCJ" || \ | |
| test -n "$runpath_var_GCJ" || \ | |
| @@ -17808,8 +18963,8 @@ | |
| # directories. | |
| hardcode_action_GCJ=unsupported | |
| fi | |
| -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 | |
| -echo "${ECHO_T}$hardcode_action_GCJ" >&6 | |
| +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 | |
| +echo "${ECHO_T}$hardcode_action_GCJ" >&6; } | |
| if test "$hardcode_action_GCJ" = relink; then | |
| # Fast installation is not supported | |
| @@ -17861,6 +19016,7 @@ | |
| predeps_GCJ \ | |
| postdeps_GCJ \ | |
| compiler_lib_search_path_GCJ \ | |
| + compiler_lib_search_dirs_GCJ \ | |
| archive_cmds_GCJ \ | |
| archive_expsym_cmds_GCJ \ | |
| postinstall_cmds_GCJ \ | |
| @@ -17876,6 +19032,7 @@ | |
| module_cmds_GCJ \ | |
| module_expsym_cmds_GCJ \ | |
| lt_cv_prog_compiler_c_o_GCJ \ | |
| + fix_srcfile_path_GCJ \ | |
| exclude_expsyms_GCJ \ | |
| include_expsyms_GCJ; do | |
| @@ -18108,6 +19265,10 @@ | |
| # shared library. | |
| postdeps=$lt_postdeps_GCJ | |
| +# The directories searched by this compiler when creating a shared | |
| +# library | |
| +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ | |
| + | |
| # The library search path used internally by the compiler when linking | |
| # a shared library. | |
| compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ | |
| @@ -18196,7 +19357,7 @@ | |
| sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Fix the shell variable \$srcfile for the compiler. | |
| -fix_srcfile_path="$fix_srcfile_path_GCJ" | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| # Set to yes if exported symbols are required. | |
| always_export_symbols=$always_export_symbols_GCJ | |
| @@ -18245,7 +19406,6 @@ | |
| RC) | |
| - | |
| # Source file extension for RC test sources. | |
| ac_ext=rc | |
| @@ -18254,7 +19414,7 @@ | |
| objext_RC=$objext | |
| # Code to be used in simple compile tests | |
| -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' | |
| +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' | |
| # Code to be used in simple link tests | |
| lt_simple_link_test_code="$lt_simple_compile_test_code" | |
| @@ -18273,16 +19433,16 @@ | |
| # save warnings/boilerplate of simple test code | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_compile_test_code" >conftest.$ac_ext | |
| eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_compiler_boilerplate=`cat conftest.err` | |
| $rm conftest* | |
| ac_outfile=conftest.$ac_objext | |
| -printf "$lt_simple_link_test_code" >conftest.$ac_ext | |
| +echo "$lt_simple_link_test_code" >conftest.$ac_ext | |
| eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err | |
| _lt_linker_boilerplate=`cat conftest.err` | |
| -$rm conftest* | |
| +$rm -r conftest* | |
| # Allow CC to be a program name with arguments. | |
| @@ -18342,6 +19502,7 @@ | |
| predeps_RC \ | |
| postdeps_RC \ | |
| compiler_lib_search_path_RC \ | |
| + compiler_lib_search_dirs_RC \ | |
| archive_cmds_RC \ | |
| archive_expsym_cmds_RC \ | |
| postinstall_cmds_RC \ | |
| @@ -18357,6 +19518,7 @@ | |
| module_cmds_RC \ | |
| module_expsym_cmds_RC \ | |
| lt_cv_prog_compiler_c_o_RC \ | |
| + fix_srcfile_path_RC \ | |
| exclude_expsyms_RC \ | |
| include_expsyms_RC; do | |
| @@ -18589,6 +19751,10 @@ | |
| # shared library. | |
| postdeps=$lt_postdeps_RC | |
| +# The directories searched by this compiler when creating a shared | |
| +# library | |
| +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC | |
| + | |
| # The library search path used internally by the compiler when linking | |
| # a shared library. | |
| compiler_lib_search_path=$lt_compiler_lib_search_path_RC | |
| @@ -18677,7 +19843,7 @@ | |
| sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec | |
| # Fix the shell variable \$srcfile for the compiler. | |
| -fix_srcfile_path="$fix_srcfile_path_RC" | |
| +fix_srcfile_path=$lt_fix_srcfile_path | |
| # Set to yes if exported symbols are required. | |
| always_export_symbols=$always_export_symbols_RC | |
| @@ -18786,8 +19952,8 @@ | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}gcc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -18800,32 +19966,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_CC="${ac_tool_prefix}gcc" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$ac_cv_prog_CC"; then | |
| ac_ct_CC=$CC | |
| # Extract the first word of "gcc", so it can be a program name with args. | |
| set dummy gcc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -18838,36 +20006,51 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_CC="gcc" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
| if test -n "$ac_ct_CC"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| -echo "${ECHO_T}$ac_ct_CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| +echo "${ECHO_T}$ac_ct_CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - CC=$ac_ct_CC | |
| + if test "x$ac_ct_CC" = x; then | |
| + CC="" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + CC=$ac_ct_CC | |
| + fi | |
| else | |
| CC="$ac_cv_prog_CC" | |
| fi | |
| if test -z "$CC"; then | |
| - if test -n "$ac_tool_prefix"; then | |
| - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | |
| + if test -n "$ac_tool_prefix"; then | |
| + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}cc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -18880,74 +20063,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_CC="${ac_tool_prefix}cc" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| -else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| -fi | |
| - | |
| -fi | |
| -if test -z "$ac_cv_prog_CC"; then | |
| - ac_ct_CC=$CC | |
| - # Extract the first word of "cc", so it can be a program name with args. | |
| -set dummy cc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
| - echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| -else | |
| - if test -n "$ac_ct_CC"; then | |
| - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. | |
| -else | |
| -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| - ac_cv_prog_ac_ct_CC="cc" | |
| - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| - break 2 | |
| - fi | |
| -done | |
| -done | |
| - | |
| -fi | |
| -fi | |
| -ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
| -if test -n "$ac_ct_CC"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| -echo "${ECHO_T}$ac_ct_CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - CC=$ac_ct_CC | |
| -else | |
| - CC="$ac_cv_prog_CC" | |
| -fi | |
| + fi | |
| fi | |
| if test -z "$CC"; then | |
| # Extract the first word of "cc", so it can be a program name with args. | |
| set dummy cc; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -18961,7 +20104,7 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then | |
| ac_prog_rejected=yes | |
| continue | |
| @@ -18972,6 +20115,7 @@ | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| if test $ac_prog_rejected = yes; then | |
| # We found a bogon in the path, so make sure we never use it. | |
| @@ -18989,22 +20133,23 @@ | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$CC"; then | |
| if test -n "$ac_tool_prefix"; then | |
| - for ac_prog in cl | |
| + for ac_prog in cl.exe | |
| do | |
| # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. | |
| set dummy $ac_tool_prefix$ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -19017,36 +20162,38 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_CC="$ac_tool_prefix$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| CC=$ac_cv_prog_CC | |
| if test -n "$CC"; then | |
| - echo "$as_me:$LINENO: result: $CC" >&5 | |
| -echo "${ECHO_T}$CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $CC" >&5 | |
| +echo "${ECHO_T}$CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$CC" && break | |
| done | |
| fi | |
| if test -z "$CC"; then | |
| ac_ct_CC=$CC | |
| - for ac_prog in cl | |
| + for ac_prog in cl.exe | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_CC+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -19059,29 +20206,45 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_CC="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| ac_ct_CC=$ac_cv_prog_ac_ct_CC | |
| if test -n "$ac_ct_CC"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| -echo "${ECHO_T}$ac_ct_CC" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 | |
| +echo "${ECHO_T}$ac_ct_CC" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$ac_ct_CC" && break | |
| done | |
| - CC=$ac_ct_CC | |
| + if test "x$ac_ct_CC" = x; then | |
| + CC="" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + CC=$ac_ct_CC | |
| + fi | |
| fi | |
| fi | |
| @@ -19094,27 +20257,41 @@ | |
| { (exit 1); exit 1; }; } | |
| # Provide some information about the compiler. | |
| -echo "$as_me:$LINENO:" \ | |
| - "checking for C compiler version" >&5 | |
| +echo "$as_me:$LINENO: checking for C compiler version" >&5 | |
| ac_compiler=`set X $ac_compile; echo $2` | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler --version </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler --version >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler --version >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -v </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -v >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -v >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 | |
| - (eval $ac_compiler -V </dev/null >&5) 2>&5 | |
| +{ (ac_try="$ac_compiler -V >&5" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compiler -V >&5") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } | |
| -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
| -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 | |
| +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } | |
| if test "${ac_cv_c_compiler_gnu+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -19137,50 +20314,49 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_compiler_gnu=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_compiler_gnu=no | |
| + ac_compiler_gnu=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| ac_cv_c_compiler_gnu=$ac_compiler_gnu | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
| -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 | |
| +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } | |
| GCC=`test $ac_compiler_gnu = yes && echo yes` | |
| ac_test_CFLAGS=${CFLAGS+set} | |
| ac_save_CFLAGS=$CFLAGS | |
| -CFLAGS="-g" | |
| -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
| -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 | |
| +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_cc_g+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| + ac_save_c_werror_flag=$ac_c_werror_flag | |
| + ac_c_werror_flag=yes | |
| + ac_cv_prog_cc_g=no | |
| + CFLAGS="-g" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| cat confdefs.h >>conftest.$ac_ext | |
| @@ -19196,38 +20372,118 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + ac_cv_prog_cc_g=yes | |
| +else | |
| + echo "$as_me: failed program was:" >&5 | |
| +sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| + CFLAGS="" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| +/* confdefs.h. */ | |
| +_ACEOF | |
| +cat confdefs.h >>conftest.$ac_ext | |
| +cat >>conftest.$ac_ext <<_ACEOF | |
| +/* end confdefs.h. */ | |
| + | |
| +int | |
| +main () | |
| +{ | |
| + | |
| + ; | |
| + return 0; | |
| +} | |
| +_ACEOF | |
| +rm -f conftest.$ac_objext | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| + grep -v '^ *+' conftest.er1 >conftest.err | |
| + rm -f conftest.er1 | |
| + cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + : | |
| +else | |
| + echo "$as_me: failed program was:" >&5 | |
| +sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| + ac_c_werror_flag=$ac_save_c_werror_flag | |
| + CFLAGS="-g" | |
| + cat >conftest.$ac_ext <<_ACEOF | |
| +/* confdefs.h. */ | |
| +_ACEOF | |
| +cat confdefs.h >>conftest.$ac_ext | |
| +cat >>conftest.$ac_ext <<_ACEOF | |
| +/* end confdefs.h. */ | |
| + | |
| +int | |
| +main () | |
| +{ | |
| + | |
| + ; | |
| + return 0; | |
| +} | |
| +_ACEOF | |
| +rm -f conftest.$ac_objext | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| + grep -v '^ *+' conftest.er1 >conftest.err | |
| + rm -f conftest.er1 | |
| + cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_prog_cc_g=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_prog_cc_g=no | |
| + | |
| +fi | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| +fi | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + ac_c_werror_flag=$ac_save_c_werror_flag | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
| -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 | |
| +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } | |
| if test "$ac_test_CFLAGS" = set; then | |
| CFLAGS=$ac_save_CFLAGS | |
| elif test $ac_cv_prog_cc_g = yes; then | |
| @@ -19243,12 +20499,12 @@ | |
| CFLAGS= | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 | |
| -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 | |
| -if test "${ac_cv_prog_cc_stdc+set}" = set; then | |
| +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 | |
| +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } | |
| +if test "${ac_cv_prog_cc_c89+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| - ac_cv_prog_cc_stdc=no | |
| + ac_cv_prog_cc_c89=no | |
| ac_save_CC=$CC | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| @@ -19282,12 +20538,17 @@ | |
| /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has | |
| function prototypes and stuff, but not '\xHH' hex character constants. | |
| These don't provoke an error unfortunately, instead are silently treated | |
| - as 'x'. The following induces an error, until -std1 is added to get | |
| + as 'x'. The following induces an error, until -std is added to get | |
| proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an | |
| array size at least. It's necessary to write '\x00'==0 to get something | |
| - that's true only with -std1. */ | |
| + that's true only with -std. */ | |
| int osf4_cc_array ['\x00' == 0 ? 1 : -1]; | |
| +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters | |
| + inside strings and character constants. */ | |
| +#define FOO(x) 'x' | |
| +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; | |
| + | |
| int test (int i, double x); | |
| struct s1 {int (*f) (int a);}; | |
| struct s2 {int (*f) (double a);}; | |
| @@ -19302,205 +20563,57 @@ | |
| return 0; | |
| } | |
| _ACEOF | |
| -# Don't try gcc -ansi; that turns off useful extensions and | |
| -# breaks some systems' header files. | |
| -# AIX -qlanglvl=ansi | |
| -# Ultrix and OSF/1 -std1 | |
| -# HP-UX 10.20 and later -Ae | |
| -# HP-UX older versions -Aa -D_HPUX_SOURCE | |
| -# SVR4 -Xc -D__EXTENSIONS__ | |
| -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | |
| +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ | |
| + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" | |
| do | |
| CC="$ac_save_CC $ac_arg" | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - ac_cv_prog_cc_stdc=$ac_arg | |
| -break | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + ac_cv_prog_cc_c89=$ac_arg | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext | |
| + test "x$ac_cv_prog_cc_c89" != "xno" && break | |
| done | |
| -rm -f conftest.$ac_ext conftest.$ac_objext | |
| +rm -f conftest.$ac_ext | |
| CC=$ac_save_CC | |
| fi | |
| - | |
| -case "x$ac_cv_prog_cc_stdc" in | |
| - x|xno) | |
| - echo "$as_me:$LINENO: result: none needed" >&5 | |
| -echo "${ECHO_T}none needed" >&6 ;; | |
| +# AC_CACHE_VAL | |
| +case "x$ac_cv_prog_cc_c89" in | |
| + x) | |
| + { echo "$as_me:$LINENO: result: none needed" >&5 | |
| +echo "${ECHO_T}none needed" >&6; } ;; | |
| + xno) | |
| + { echo "$as_me:$LINENO: result: unsupported" >&5 | |
| +echo "${ECHO_T}unsupported" >&6; } ;; | |
| *) | |
| - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 | |
| -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 | |
| - CC="$CC $ac_cv_prog_cc_stdc" ;; | |
| + CC="$CC $ac_cv_prog_cc_c89" | |
| + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 | |
| +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; | |
| esac | |
| -# Some people use a C++ compiler to compile C. Since we use `exit', | |
| -# in C++ we need to declare it. In case someone uses the same compiler | |
| -# for both compiling C and C++ we need to have the C++ compiler decide | |
| -# the declaration of exit, since it's the most demanding environment. | |
| -cat >conftest.$ac_ext <<_ACEOF | |
| -#ifndef __cplusplus | |
| - choke me | |
| -#endif | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - for ac_declaration in \ | |
| - '' \ | |
| - 'extern "C" void std::exit (int) throw (); using std::exit;' \ | |
| - 'extern "C" void std::exit (int); using std::exit;' \ | |
| - 'extern "C" void exit (int) throw ();' \ | |
| - 'extern "C" void exit (int);' \ | |
| - 'void exit (int);' | |
| -do | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| -/* confdefs.h. */ | |
| -_ACEOF | |
| -cat confdefs.h >>conftest.$ac_ext | |
| -cat >>conftest.$ac_ext <<_ACEOF | |
| -/* end confdefs.h. */ | |
| -$ac_declaration | |
| -#include <stdlib.h> | |
| -int | |
| -main () | |
| -{ | |
| -exit (42); | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - : | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| - | |
| -continue | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| -/* confdefs.h. */ | |
| -_ACEOF | |
| -cat confdefs.h >>conftest.$ac_ext | |
| -cat >>conftest.$ac_ext <<_ACEOF | |
| -/* end confdefs.h. */ | |
| -$ac_declaration | |
| -int | |
| -main () | |
| -{ | |
| -exit (42); | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - break | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| - | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -done | |
| -rm -f conftest* | |
| -if test -n "$ac_declaration"; then | |
| - echo '#ifdef __cplusplus' >>confdefs.h | |
| - echo $ac_declaration >>confdefs.h | |
| - echo '#endif' >>confdefs.h | |
| -fi | |
| - | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| ac_ext=c | |
| ac_cpp='$CPP $CPPFLAGS' | |
| ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | |
| @@ -19509,8 +20622,8 @@ | |
| depcc="$CC" am_compiler_list= | |
| -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | |
| -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 | |
| +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } | |
| if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -19574,6 +20687,7 @@ | |
| depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ | |
| $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ | |
| >/dev/null 2>conftest.err && | |
| + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && | |
| grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && | |
| ${MAKE-make} -s -f confmf > /dev/null 2>&1; then | |
| @@ -19599,13 +20713,11 @@ | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | |
| -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 | |
| +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 | |
| +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } | |
| CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type | |
| - | |
| - | |
| -if | |
| + if | |
| test "x$enable_dependency_tracking" != xno \ | |
| && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then | |
| am__fastdepCC_TRUE= | |
| @@ -19629,8 +20741,8 @@ | |
| # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" | |
| # OS/2's system install, which has a completely different semantic | |
| # ./install, which can be erroneously created by make from ./install.sh. | |
| -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | |
| -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 | |
| +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } | |
| if test -z "$INSTALL"; then | |
| if test "${ac_cv_path_install+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| @@ -19652,7 +20764,7 @@ | |
| # by default. | |
| for ac_prog in ginstall scoinst install; do | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
| if test $ac_prog = install && | |
| grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then | |
| # AIX install. It has an incompatible calling convention. | |
| @@ -19671,21 +20783,22 @@ | |
| ;; | |
| esac | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| if test "${ac_cv_path_install+set}" = set; then | |
| INSTALL=$ac_cv_path_install | |
| else | |
| - # As a last resort, use the slow shell script. We don't cache a | |
| - # path for INSTALL within a source directory, because that will | |
| + # As a last resort, use the slow shell script. Don't cache a | |
| + # value for INSTALL within a source directory, because that will | |
| # break other packages using the cache if that directory is | |
| - # removed, or if the path is relative. | |
| + # removed, or if the value is a relative name. | |
| INSTALL=$ac_install_sh | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $INSTALL" >&5 | |
| -echo "${ECHO_T}$INSTALL" >&6 | |
| +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 | |
| +echo "${ECHO_T}$INSTALL" >&6; } | |
| # Use test -z because SunOS4 sh mishandles braces in ${var-val}. | |
| # It thinks the first close brace ends the variable substitution. | |
| @@ -19695,51 +20808,52 @@ | |
| test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' | |
| -echo "$as_me:$LINENO: checking whether ln -s works" >&5 | |
| -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 | |
| +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } | |
| LN_S=$as_ln_s | |
| if test "$LN_S" = "ln -s"; then | |
| - echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| + { echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | |
| -echo "${ECHO_T}no, using $LN_S" >&6 | |
| + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 | |
| +echo "${ECHO_T}no, using $LN_S" >&6; } | |
| fi | |
| -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | |
| -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 | |
| -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` | |
| -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 | |
| +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } | |
| +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | |
| +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| cat >conftest.make <<\_ACEOF | |
| +SHELL = /bin/sh | |
| all: | |
| - @echo 'ac_maketemp="$(MAKE)"' | |
| + @echo '@@@%%%=$(MAKE)=@@@%%%' | |
| _ACEOF | |
| # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | |
| -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` | |
| -if test -n "$ac_maketemp"; then | |
| - eval ac_cv_prog_make_${ac_make}_set=yes | |
| -else | |
| - eval ac_cv_prog_make_${ac_make}_set=no | |
| -fi | |
| +case `${MAKE-make} -f conftest.make 2>/dev/null` in | |
| + *@@@%%%=?*=@@@%%%*) | |
| + eval ac_cv_prog_make_${ac_make}_set=yes;; | |
| + *) | |
| + eval ac_cv_prog_make_${ac_make}_set=no;; | |
| +esac | |
| rm -f conftest.make | |
| fi | |
| -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then | |
| - echo "$as_me:$LINENO: result: yes" >&5 | |
| -echo "${ECHO_T}yes" >&6 | |
| +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then | |
| + { echo "$as_me:$LINENO: result: yes" >&5 | |
| +echo "${ECHO_T}yes" >&6; } | |
| SET_MAKE= | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| SET_MAKE="MAKE=${MAKE-make}" | |
| fi | |
| if test -n "$ac_tool_prefix"; then | |
| # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. | |
| set dummy ${ac_tool_prefix}ranlib; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_RANLIB+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -19752,32 +20866,34 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| RANLIB=$ac_cv_prog_RANLIB | |
| if test -n "$RANLIB"; then | |
| - echo "$as_me:$LINENO: result: $RANLIB" >&5 | |
| -echo "${ECHO_T}$RANLIB" >&6 | |
| + { echo "$as_me:$LINENO: result: $RANLIB" >&5 | |
| +echo "${ECHO_T}$RANLIB" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| fi | |
| if test -z "$ac_cv_prog_RANLIB"; then | |
| ac_ct_RANLIB=$RANLIB | |
| # Extract the first word of "ranlib", so it can be a program name with args. | |
| set dummy ranlib; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -19790,27 +20906,41 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_ac_ct_RANLIB="ranlib" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" | |
| fi | |
| fi | |
| ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB | |
| if test -n "$ac_ct_RANLIB"; then | |
| - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | |
| -echo "${ECHO_T}$ac_ct_RANLIB" >&6 | |
| + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 | |
| +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| - RANLIB=$ac_ct_RANLIB | |
| + if test "x$ac_ct_RANLIB" = x; then | |
| + RANLIB=":" | |
| + else | |
| + case $cross_compiling:$ac_tool_warned in | |
| +yes:) | |
| +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&5 | |
| +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools | |
| +whose name does not start with the host triplet. If you think this | |
| +configuration is useful to you, please write to autoconf@gnu.org." >&2;} | |
| +ac_tool_warned=yes ;; | |
| +esac | |
| + RANLIB=$ac_ct_RANLIB | |
| + fi | |
| else | |
| RANLIB="$ac_cv_prog_RANLIB" | |
| fi | |
| @@ -19819,8 +20949,8 @@ | |
| do | |
| # Extract the first word of "$ac_prog", so it can be a program name with args. | |
| set dummy $ac_prog; ac_word=$2 | |
| -echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
| +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } | |
| if test "${ac_cv_prog_AWK+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -19833,25 +20963,27 @@ | |
| IFS=$as_save_IFS | |
| test -z "$as_dir" && as_dir=. | |
| for ac_exec_ext in '' $ac_executable_extensions; do | |
| - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
| + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
| ac_cv_prog_AWK="$ac_prog" | |
| echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
| break 2 | |
| fi | |
| done | |
| done | |
| +IFS=$as_save_IFS | |
| fi | |
| fi | |
| AWK=$ac_cv_prog_AWK | |
| if test -n "$AWK"; then | |
| - echo "$as_me:$LINENO: result: $AWK" >&5 | |
| -echo "${ECHO_T}$AWK" >&6 | |
| + { echo "$as_me:$LINENO: result: $AWK" >&5 | |
| +echo "${ECHO_T}$AWK" >&6; } | |
| else | |
| - echo "$as_me:$LINENO: result: no" >&5 | |
| -echo "${ECHO_T}no" >&6 | |
| + { echo "$as_me:$LINENO: result: no" >&5 | |
| +echo "${ECHO_T}no" >&6; } | |
| fi | |
| + | |
| test -n "$AWK" && break | |
| done | |
| @@ -19865,9 +20997,9 @@ | |
| ac_header_dirent=no | |
| for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do | |
| as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` | |
| -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 | |
| -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 | |
| +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| cat >conftest.$ac_ext <<_ACEOF | |
| @@ -19889,38 +21021,35 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| eval "$as_ac_Header=yes" | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -eval "$as_ac_Header=no" | |
| + eval "$as_ac_Header=no" | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| if test `eval echo '${'$as_ac_Header'}'` = yes; then | |
| cat >>confdefs.h <<_ACEOF | |
| #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 | |
| @@ -19932,13 +21061,12 @@ | |
| done | |
| # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. | |
| if test $ac_header_dirent = dirent.h; then | |
| - echo "$as_me:$LINENO: checking for library containing opendir" >&5 | |
| -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 | |
| +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } | |
| if test "${ac_cv_search_opendir+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| ac_func_search_save_LIBS=$LIBS | |
| -ac_cv_search_opendir=no | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -19946,126 +21074,83 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char opendir (); | |
| int | |
| main () | |
| { | |
| -opendir (); | |
| +return opendir (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| -rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +for ac_lib in '' dir; do | |
| + if test -z "$ac_lib"; then | |
| + ac_res="none required" | |
| + else | |
| + ac_res=-l$ac_lib | |
| + LIBS="-l$ac_lib $ac_func_search_save_LIBS" | |
| + fi | |
| + rm -f conftest.$ac_objext conftest$ac_exeext | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - ac_cv_search_opendir="none required" | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + ac_cv_search_opendir=$ac_res | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| - conftest$ac_exeext conftest.$ac_ext | |
| -if test "$ac_cv_search_opendir" = no; then | |
| - for ac_lib in dir; do | |
| - LIBS="-l$ac_lib $ac_func_search_save_LIBS" | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| -/* confdefs.h. */ | |
| -_ACEOF | |
| -cat confdefs.h >>conftest.$ac_ext | |
| -cat >>conftest.$ac_ext <<_ACEOF | |
| -/* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| -#ifdef __cplusplus | |
| -extern "C" | |
| -#endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| -char opendir (); | |
| -int | |
| -main () | |
| -{ | |
| -opendir (); | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - ac_cv_search_opendir="-l$ac_lib" | |
| -break | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| +fi | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| + conftest$ac_exeext | |
| + if test "${ac_cv_search_opendir+set}" = set; then | |
| + break | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| - conftest$ac_exeext conftest.$ac_ext | |
| - done | |
| +done | |
| +if test "${ac_cv_search_opendir+set}" = set; then | |
| + : | |
| +else | |
| + ac_cv_search_opendir=no | |
| fi | |
| +rm conftest.$ac_ext | |
| LIBS=$ac_func_search_save_LIBS | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 | |
| -echo "${ECHO_T}$ac_cv_search_opendir" >&6 | |
| -if test "$ac_cv_search_opendir" != no; then | |
| - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 | |
| +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } | |
| +ac_res=$ac_cv_search_opendir | |
| +if test "$ac_res" != no; then | |
| + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | |
| fi | |
| else | |
| - echo "$as_me:$LINENO: checking for library containing opendir" >&5 | |
| -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 | |
| + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 | |
| +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } | |
| if test "${ac_cv_search_opendir+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| ac_func_search_save_LIBS=$LIBS | |
| -ac_cv_search_opendir=no | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -20073,122 +21158,80 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char opendir (); | |
| int | |
| main () | |
| { | |
| -opendir (); | |
| +return opendir (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| -rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +for ac_lib in '' x; do | |
| + if test -z "$ac_lib"; then | |
| + ac_res="none required" | |
| + else | |
| + ac_res=-l$ac_lib | |
| + LIBS="-l$ac_lib $ac_func_search_save_LIBS" | |
| + fi | |
| + rm -f conftest.$ac_objext conftest$ac_exeext | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - ac_cv_search_opendir="none required" | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| + ac_cv_search_opendir=$ac_res | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| - conftest$ac_exeext conftest.$ac_ext | |
| -if test "$ac_cv_search_opendir" = no; then | |
| - for ac_lib in x; do | |
| - LIBS="-l$ac_lib $ac_func_search_save_LIBS" | |
| - cat >conftest.$ac_ext <<_ACEOF | |
| -/* confdefs.h. */ | |
| -_ACEOF | |
| -cat confdefs.h >>conftest.$ac_ext | |
| -cat >>conftest.$ac_ext <<_ACEOF | |
| -/* end confdefs.h. */ | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| -#ifdef __cplusplus | |
| -extern "C" | |
| -#endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| -char opendir (); | |
| -int | |
| -main () | |
| -{ | |
| -opendir (); | |
| - ; | |
| - return 0; | |
| -} | |
| -_ACEOF | |
| -rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| - ac_status=$? | |
| - grep -v '^ *+' conftest.er1 >conftest.err | |
| - rm -f conftest.er1 | |
| - cat conftest.err >&5 | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - ac_cv_search_opendir="-l$ac_lib" | |
| -break | |
| -else | |
| - echo "$as_me: failed program was:" >&5 | |
| -sed 's/^/| /' conftest.$ac_ext >&5 | |
| +fi | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| + conftest$ac_exeext | |
| + if test "${ac_cv_search_opendir+set}" = set; then | |
| + break | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| - conftest$ac_exeext conftest.$ac_ext | |
| - done | |
| +done | |
| +if test "${ac_cv_search_opendir+set}" = set; then | |
| + : | |
| +else | |
| + ac_cv_search_opendir=no | |
| fi | |
| +rm conftest.$ac_ext | |
| LIBS=$ac_func_search_save_LIBS | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 | |
| -echo "${ECHO_T}$ac_cv_search_opendir" >&6 | |
| -if test "$ac_cv_search_opendir" != no; then | |
| - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 | |
| +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } | |
| +ac_res=$ac_cv_search_opendir | |
| +if test "$ac_res" != no; then | |
| + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | |
| -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | |
| +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } | |
| if test "${ac_cv_header_stdc+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -20212,35 +21255,31 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_header_stdc=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_header_stdc=no | |
| + ac_cv_header_stdc=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| if test $ac_cv_header_stdc = yes; then | |
| # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | |
| @@ -20296,6 +21335,7 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| #include <ctype.h> | |
| +#include <stdlib.h> | |
| #if ((' ' & 0x0FF) == 0x020) | |
| # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | |
| # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) | |
| @@ -20315,18 +21355,27 @@ | |
| for (i = 0; i < 256; i++) | |
| if (XOR (islower (i), ISLOWER (i)) | |
| || toupper (i) != TOUPPER (i)) | |
| - exit(2); | |
| - exit (0); | |
| + return 2; | |
| + return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>&5 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + { (case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_try") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; }; then | |
| @@ -20339,12 +21388,14 @@ | |
| ( exit $ac_status ) | |
| ac_cv_header_stdc=no | |
| fi | |
| -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| + | |
| + | |
| fi | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | |
| -echo "${ECHO_T}$ac_cv_header_stdc" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 | |
| +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } | |
| if test $ac_cv_header_stdc = yes; then | |
| cat >>confdefs.h <<\_ACEOF | |
| @@ -20361,18 +21412,19 @@ | |
| for ac_header in fcntl.h malloc.h stdlib.h string.h unistd.h | |
| do | |
| as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| - echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| else | |
| # Is the header compilable? | |
| -echo "$as_me:$LINENO: checking $ac_header usability" >&5 | |
| -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | |
| +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -20383,41 +21435,37 @@ | |
| #include <$ac_header> | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_header_compiler=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_header_compiler=no | |
| + ac_header_compiler=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
| -echo "${ECHO_T}$ac_header_compiler" >&6 | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
| +echo "${ECHO_T}$ac_header_compiler" >&6; } | |
| # Is the header present? | |
| -echo "$as_me:$LINENO: checking $ac_header presence" >&5 | |
| -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | |
| +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -20426,24 +21474,22 @@ | |
| /* end confdefs.h. */ | |
| #include <$ac_header> | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_c_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| ac_header_preproc=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| @@ -20451,9 +21497,10 @@ | |
| ac_header_preproc=no | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
| -echo "${ECHO_T}$ac_header_preproc" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
| +echo "${ECHO_T}$ac_header_preproc" >&6; } | |
| # So? What about this header? | |
| case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | |
| @@ -20477,25 +21524,24 @@ | |
| echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | |
| { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | |
| echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | |
| - ( | |
| - cat <<\_ASBOX | |
| + ( cat <<\_ASBOX | |
| ## ----------------------------------------------------- ## | |
| ## Report this to linux-diag-devel@lists.sourceforge.net ## | |
| ## ----------------------------------------------------- ## | |
| _ASBOX | |
| - ) | | |
| - sed "s/^/$as_me: WARNING: /" >&2 | |
| + ) | sed "s/^/$as_me: WARNING: /" >&2 | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| eval "$as_ac_Header=\$ac_header_preproc" | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| fi | |
| if test `eval echo '${'$as_ac_Header'}'` = yes; then | |
| @@ -20509,8 +21555,8 @@ | |
| # Checks for typedefs, structures, and compiler characteristics. | |
| -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 | |
| -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 | |
| +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } | |
| if test "${ac_cv_c_const+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -20528,10 +21574,10 @@ | |
| #ifndef __cplusplus | |
| /* Ultrix mips cc rejects this. */ | |
| typedef int charset[2]; | |
| - const charset x; | |
| + const charset cs; | |
| /* SunOS 4.1.1 cc rejects this. */ | |
| - char const *const *ccp; | |
| - char **p; | |
| + char const *const *pcpcc; | |
| + char **ppc; | |
| /* NEC SVR4.0.2 mips cc rejects this. */ | |
| struct point {int x, y;}; | |
| static struct point const zero = {0,0}; | |
| @@ -20540,16 +21586,17 @@ | |
| an arm of an if-expression whose if-part is not a constant | |
| expression */ | |
| const char *g = "string"; | |
| - ccp = &g + (g ? g-g : 0); | |
| + pcpcc = &g + (g ? g-g : 0); | |
| /* HPUX 7.0 cc rejects these. */ | |
| - ++ccp; | |
| - p = (char**) ccp; | |
| - ccp = (char const *const *) p; | |
| + ++pcpcc; | |
| + ppc = (char**) pcpcc; | |
| + pcpcc = (char const *const *) ppc; | |
| { /* SCO 3.2v4 cc rejects this. */ | |
| char *t; | |
| char const *s = 0 ? (char *) 0 : (char const *) 0; | |
| *t++ = 0; | |
| + if (s) return 0; | |
| } | |
| { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ | |
| int x[] = {25, 17}; | |
| @@ -20568,7 +21615,9 @@ | |
| } | |
| { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ | |
| const int foo = 10; | |
| + if (!foo) return 0; | |
| } | |
| + return !cs[0] && !zero.x; | |
| #endif | |
| ; | |
| @@ -20576,38 +21625,34 @@ | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_c_const=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_c_const=no | |
| + ac_cv_c_const=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 | |
| -echo "${ECHO_T}$ac_cv_c_const" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 | |
| +echo "${ECHO_T}$ac_cv_c_const" >&6; } | |
| if test $ac_cv_c_const = no; then | |
| cat >>confdefs.h <<\_ACEOF | |
| @@ -20616,8 +21661,8 @@ | |
| fi | |
| -echo "$as_me:$LINENO: checking for inline" >&5 | |
| -echo $ECHO_N "checking for inline... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for inline" >&5 | |
| +echo $ECHO_N "checking for inline... $ECHO_C" >&6; } | |
| if test "${ac_cv_c_inline+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -20637,39 +21682,37 @@ | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| - ac_cv_c_inline=$ac_kw; break | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| + ac_cv_c_inline=$ac_kw | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| + | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + test "$ac_cv_c_inline" != no && break | |
| done | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 | |
| -echo "${ECHO_T}$ac_cv_c_inline" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 | |
| +echo "${ECHO_T}$ac_cv_c_inline" >&6; } | |
| case $ac_cv_c_inline in | |
| @@ -20687,8 +21730,8 @@ | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking for size_t" >&5 | |
| -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for size_t" >&5 | |
| +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } | |
| if test "${ac_cv_type_size_t+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -20699,64 +21742,61 @@ | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| $ac_includes_default | |
| +typedef size_t ac__type_new_; | |
| int | |
| main () | |
| { | |
| -if ((size_t *) 0) | |
| +if ((ac__type_new_ *) 0) | |
| return 0; | |
| -if (sizeof (size_t)) | |
| +if (sizeof (ac__type_new_)) | |
| return 0; | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_cv_type_size_t=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_cv_type_size_t=no | |
| + ac_cv_type_size_t=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 | |
| -echo "${ECHO_T}$ac_cv_type_size_t" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 | |
| +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } | |
| if test $ac_cv_type_size_t = yes; then | |
| : | |
| else | |
| cat >>confdefs.h <<_ACEOF | |
| -#define size_t unsigned | |
| +#define size_t unsigned int | |
| _ACEOF | |
| fi | |
| # Checks for library functions. | |
| -echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 | |
| -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 | |
| +echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } | |
| if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -20780,19 +21820,28 @@ | |
| /* Linux will dereference the symlink and fail. | |
| That is better in the sense that it means we will not | |
| have to compile and use the lstat wrapper. */ | |
| - exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1); | |
| + return lstat ("conftest.sym/", &sbuf) == 0; | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>&5 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + { (case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_try") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; }; then | |
| @@ -20805,8 +21854,10 @@ | |
| ( exit $ac_status ) | |
| ac_cv_func_lstat_dereferences_slashed_symlink=no | |
| fi | |
| -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| + | |
| + | |
| else | |
| # If the `ln -s' command failed, then we probably don't even | |
| # have an lstat function. | |
| @@ -20815,8 +21866,8 @@ | |
| rm -f conftest.sym conftest.file | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 | |
| -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 | |
| +echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } | |
| test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && | |
| @@ -20826,18 +21877,16 @@ | |
| if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then | |
| - case $LIBOBJS in | |
| - "lstat.$ac_objext" | \ | |
| - *" lstat.$ac_objext" | \ | |
| - "lstat.$ac_objext "* | \ | |
| + case " $LIBOBJS " in | |
| *" lstat.$ac_objext "* ) ;; | |
| - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;; | |
| + *) LIBOBJS="$LIBOBJS lstat.$ac_objext" | |
| + ;; | |
| esac | |
| fi | |
| -echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5 | |
| -echo $ECHO_N "checking whether lstat accepts an empty string... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5 | |
| +echo $ECHO_N "checking whether lstat accepts an empty string... $ECHO_C" >&6; } | |
| if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -20855,43 +21904,52 @@ | |
| main () | |
| { | |
| struct stat sbuf; | |
| - exit (lstat ("", &sbuf) ? 1 : 0); | |
| + return lstat ("", &sbuf) == 0; | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>&5 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + { (case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_try") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; }; then | |
| - ac_cv_func_lstat_empty_string_bug=yes | |
| + ac_cv_func_lstat_empty_string_bug=no | |
| else | |
| echo "$as_me: program exited with status $ac_status" >&5 | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| ( exit $ac_status ) | |
| -ac_cv_func_lstat_empty_string_bug=no | |
| +ac_cv_func_lstat_empty_string_bug=yes | |
| fi | |
| -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| + | |
| + | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_func_lstat_empty_string_bug" >&5 | |
| -echo "${ECHO_T}$ac_cv_func_lstat_empty_string_bug" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_empty_string_bug" >&5 | |
| +echo "${ECHO_T}$ac_cv_func_lstat_empty_string_bug" >&6; } | |
| if test $ac_cv_func_lstat_empty_string_bug = yes; then | |
| - case $LIBOBJS in | |
| - "lstat.$ac_objext" | \ | |
| - *" lstat.$ac_objext" | \ | |
| - "lstat.$ac_objext "* | \ | |
| + case " $LIBOBJS " in | |
| *" lstat.$ac_objext "* ) ;; | |
| - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;; | |
| + *) LIBOBJS="$LIBOBJS lstat.$ac_objext" | |
| + ;; | |
| esac | |
| @@ -20905,18 +21963,19 @@ | |
| for ac_header in stdlib.h | |
| do | |
| as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| - echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| + { echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| else | |
| # Is the header compilable? | |
| -echo "$as_me:$LINENO: checking $ac_header usability" >&5 | |
| -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 | |
| +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -20927,41 +21986,37 @@ | |
| #include <$ac_header> | |
| _ACEOF | |
| rm -f conftest.$ac_objext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 | |
| - (eval $ac_compile) 2>conftest.er1 | |
| +if { (ac_try="$ac_compile" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_compile") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest.$ac_objext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest.$ac_objext; then | |
| ac_header_compiler=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -ac_header_compiler=no | |
| + ac_header_compiler=no | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext | |
| -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
| -echo "${ECHO_T}$ac_header_compiler" >&6 | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | |
| +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 | |
| +echo "${ECHO_T}$ac_header_compiler" >&6; } | |
| # Is the header present? | |
| -echo "$as_me:$LINENO: checking $ac_header presence" >&5 | |
| -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 | |
| +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } | |
| cat >conftest.$ac_ext <<_ACEOF | |
| /* confdefs.h. */ | |
| _ACEOF | |
| @@ -20970,24 +22025,22 @@ | |
| /* end confdefs.h. */ | |
| #include <$ac_header> | |
| _ACEOF | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 | |
| - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 | |
| +if { (ac_try="$ac_cpp conftest.$ac_ext" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } >/dev/null; then | |
| - if test -s conftest.err; then | |
| - ac_cpp_err=$ac_c_preproc_warn_flag | |
| - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag | |
| - else | |
| - ac_cpp_err= | |
| - fi | |
| -else | |
| - ac_cpp_err=yes | |
| -fi | |
| -if test -z "$ac_cpp_err"; then | |
| + (exit $ac_status); } >/dev/null && { | |
| + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + }; then | |
| ac_header_preproc=yes | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| @@ -20995,9 +22048,10 @@ | |
| ac_header_preproc=no | |
| fi | |
| + | |
| rm -f conftest.err conftest.$ac_ext | |
| -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
| -echo "${ECHO_T}$ac_header_preproc" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 | |
| +echo "${ECHO_T}$ac_header_preproc" >&6; } | |
| # So? What about this header? | |
| case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in | |
| @@ -21021,25 +22075,24 @@ | |
| echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} | |
| { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 | |
| echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} | |
| - ( | |
| - cat <<\_ASBOX | |
| + ( cat <<\_ASBOX | |
| ## ----------------------------------------------------- ## | |
| ## Report this to linux-diag-devel@lists.sourceforge.net ## | |
| ## ----------------------------------------------------- ## | |
| _ASBOX | |
| - ) | | |
| - sed "s/^/$as_me: WARNING: /" >&2 | |
| + ) | sed "s/^/$as_me: WARNING: /" >&2 | |
| ;; | |
| esac | |
| -echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_Header+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 | |
| +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| eval "$as_ac_Header=\$ac_header_preproc" | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_Header'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| fi | |
| if test `eval echo '${'$as_ac_Header'}'` = yes; then | |
| @@ -21051,8 +22104,8 @@ | |
| done | |
| -echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 | |
| -echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 | |
| +echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; } | |
| if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -21065,7 +22118,7 @@ | |
| cat confdefs.h >>conftest.$ac_ext | |
| cat >>conftest.$ac_ext <<_ACEOF | |
| /* end confdefs.h. */ | |
| -#if STDC_HEADERS || HAVE_STDLIB_H | |
| +#if defined STDC_HEADERS || defined HAVE_STDLIB_H | |
| # include <stdlib.h> | |
| #else | |
| char *malloc (); | |
| @@ -21074,19 +22127,28 @@ | |
| int | |
| main () | |
| { | |
| -exit (malloc (0) ? 0 : 1); | |
| +return ! malloc (0); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>&5 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + { (case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_try") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; }; then | |
| @@ -21099,11 +22161,13 @@ | |
| ( exit $ac_status ) | |
| ac_cv_func_malloc_0_nonnull=no | |
| fi | |
| -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| + | |
| + | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 | |
| -echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 | |
| +echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; } | |
| if test $ac_cv_func_malloc_0_nonnull = yes; then | |
| cat >>confdefs.h <<\_ACEOF | |
| @@ -21115,12 +22179,10 @@ | |
| #define HAVE_MALLOC 0 | |
| _ACEOF | |
| - case $LIBOBJS in | |
| - "malloc.$ac_objext" | \ | |
| - *" malloc.$ac_objext" | \ | |
| - "malloc.$ac_objext "* | \ | |
| + case " $LIBOBJS " in | |
| *" malloc.$ac_objext "* ) ;; | |
| - *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;; | |
| + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" | |
| + ;; | |
| esac | |
| @@ -21132,8 +22194,8 @@ | |
| -echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 | |
| -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6 | |
| +{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 | |
| +echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; } | |
| if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| @@ -21151,43 +22213,52 @@ | |
| main () | |
| { | |
| struct stat sbuf; | |
| - exit (stat ("", &sbuf) ? 1 : 0); | |
| + return stat ("", &sbuf) == 0; | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>&5 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); } && { ac_try='./conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| + { (case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_try") 2>&5 | |
| ac_status=$? | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| (exit $ac_status); }; }; then | |
| - ac_cv_func_stat_empty_string_bug=yes | |
| + ac_cv_func_stat_empty_string_bug=no | |
| else | |
| echo "$as_me: program exited with status $ac_status" >&5 | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| ( exit $ac_status ) | |
| -ac_cv_func_stat_empty_string_bug=no | |
| +ac_cv_func_stat_empty_string_bug=yes | |
| fi | |
| -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext | |
| fi | |
| + | |
| + | |
| fi | |
| -echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 | |
| -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6 | |
| +{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 | |
| +echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; } | |
| if test $ac_cv_func_stat_empty_string_bug = yes; then | |
| - case $LIBOBJS in | |
| - "stat.$ac_objext" | \ | |
| - *" stat.$ac_objext" | \ | |
| - "stat.$ac_objext "* | \ | |
| + case " $LIBOBJS " in | |
| *" stat.$ac_objext "* ) ;; | |
| - *) LIBOBJS="$LIBOBJS stat.$ac_objext" ;; | |
| + *) LIBOBJS="$LIBOBJS stat.$ac_objext" | |
| + ;; | |
| esac | |
| @@ -21208,9 +22279,9 @@ | |
| for ac_func in bzero isascii memset strchr strerror strrchr strstr strtol | |
| do | |
| as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | |
| -echo "$as_me:$LINENO: checking for $ac_func" >&5 | |
| -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | |
| -if eval "test \"\${$as_ac_var+set}\" = set"; then | |
| +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 | |
| +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } | |
| +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then | |
| echo $ECHO_N "(cached) $ECHO_C" >&6 | |
| else | |
| cat >conftest.$ac_ext <<_ACEOF | |
| @@ -21236,68 +22307,60 @@ | |
| #undef $ac_func | |
| -/* Override any gcc2 internal prototype to avoid an error. */ | |
| +/* Override any GCC internal prototype to avoid an error. | |
| + Use char because int might match the return type of a GCC | |
| + builtin and then its argument prototype would still apply. */ | |
| #ifdef __cplusplus | |
| extern "C" | |
| -{ | |
| #endif | |
| -/* We use char because int might match the return type of a gcc2 | |
| - builtin and then its argument prototype would still apply. */ | |
| char $ac_func (); | |
| /* The GNU C library defines this for functions which it implements | |
| to always fail with ENOSYS. Some functions are actually named | |
| something starting with __ and the normal name is an alias. */ | |
| -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) | |
| +#if defined __stub_$ac_func || defined __stub___$ac_func | |
| choke me | |
| -#else | |
| -char (*f) () = $ac_func; | |
| -#endif | |
| -#ifdef __cplusplus | |
| -} | |
| #endif | |
| int | |
| main () | |
| { | |
| -return f != $ac_func; | |
| +return $ac_func (); | |
| ; | |
| return 0; | |
| } | |
| _ACEOF | |
| rm -f conftest.$ac_objext conftest$ac_exeext | |
| -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
| - (eval $ac_link) 2>conftest.er1 | |
| +if { (ac_try="$ac_link" | |
| +case "(($ac_try" in | |
| + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | |
| + *) ac_try_echo=$ac_try;; | |
| +esac | |
| +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | |
| + (eval "$ac_link") 2>conftest.er1 | |
| ac_status=$? | |
| grep -v '^ *+' conftest.er1 >conftest.err | |
| rm -f conftest.er1 | |
| cat conftest.err >&5 | |
| echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); } && | |
| - { ac_try='test -z "$ac_c_werror_flag" | |
| - || test ! -s conftest.err' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; } && | |
| - { ac_try='test -s conftest$ac_exeext' | |
| - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
| - (eval $ac_try) 2>&5 | |
| - ac_status=$? | |
| - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
| - (exit $ac_status); }; }; then | |
| + (exit $ac_status); } && { | |
| + test -z "$ac_c_werror_flag" || | |
| + test ! -s conftest.err | |
| + } && test -s conftest$ac_exeext && | |
| + $as_test_x conftest$ac_exeext; then | |
| eval "$as_ac_var=yes" | |
| else | |
| echo "$as_me: failed program was:" >&5 | |
| sed 's/^/| /' conftest.$ac_ext >&5 | |
| -eval "$as_ac_var=no" | |
| + eval "$as_ac_var=no" | |
| fi | |
| -rm -f conftest.err conftest.$ac_objext \ | |
| + | |
| +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | |
| conftest$ac_exeext conftest.$ac_ext | |
| fi | |
| -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | |
| -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | |
| +ac_res=`eval echo '${'$as_ac_var'}'` | |
| + { echo "$as_me:$LINENO: result: $ac_res" >&5 | |
| +echo "${ECHO_T}$ac_res" >&6; } | |
| if test `eval echo '${'$as_ac_var'}'` = yes; then | |
| cat >>confdefs.h <<_ACEOF | |
| #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |
| @@ -21307,7 +22370,7 @@ | |
| done | |
| - ac_config_files="$ac_config_files Makefile lib/Makefile cmd/Makefile test/Makefile" | |
| +ac_config_files="$ac_config_files Makefile lib/Makefile cmd/Makefile test/Makefile test/create-test.sh" | |
| cat >confcache <<\_ACEOF | |
| # This file is a shell script that caches the results of configure | |
| @@ -21327,39 +22390,58 @@ | |
| # The following way of writing the cache mishandles newlines in values, | |
| # but we know of no workaround that is simple, portable, and efficient. | |
| -# So, don't put newlines in cache variables' values. | |
| +# So, we kill variables containing newlines. | |
| # Ultrix sh set writes to stderr and can't be redirected directly, | |
| # and sets the high bit in the cache file unless we assign to the vars. | |
| -{ | |
| +( | |
| + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do | |
| + eval ac_val=\$$ac_var | |
| + case $ac_val in #( | |
| + *${as_nl}*) | |
| + case $ac_var in #( | |
| + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 | |
| +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; | |
| + esac | |
| + case $ac_var in #( | |
| + _ | IFS | as_nl) ;; #( | |
| + *) $as_unset $ac_var ;; | |
| + esac ;; | |
| + esac | |
| + done | |
| + | |
| (set) 2>&1 | | |
| - case `(ac_space=' '; set | grep ac_space) 2>&1` in | |
| - *ac_space=\ *) | |
| + case $as_nl`(ac_space=' '; set) 2>&1` in #( | |
| + *${as_nl}ac_space=\ *) | |
| # `set' does not quote correctly, so add quotes (double-quote | |
| # substitution turns \\\\ into \\, and sed turns \\ into \). | |
| sed -n \ | |
| "s/'/'\\\\''/g; | |
| s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" | |
| - ;; | |
| + ;; #( | |
| *) | |
| # `set' quotes correctly as required by POSIX, so do not add quotes. | |
| - sed -n \ | |
| - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" | |
| + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" | |
| ;; | |
| - esac; | |
| -} | | |
| + esac | | |
| + sort | |
| +) | | |
| sed ' | |
| + /^ac_cv_env_/b end | |
| t clear | |
| - : clear | |
| + :clear | |
| s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ | |
| t end | |
| - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ | |
| - : end' >>confcache | |
| -if diff $cache_file confcache >/dev/null 2>&1; then :; else | |
| - if test -w $cache_file; then | |
| - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" | |
| + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ | |
| + :end' >>confcache | |
| +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else | |
| + if test -w "$cache_file"; then | |
| + test "x$cache_file" != "x/dev/null" && | |
| + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 | |
| +echo "$as_me: updating cache $cache_file" >&6;} | |
| cat confcache >$cache_file | |
| else | |
| - echo "not updating unwritable cache $cache_file" | |
| + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 | |
| +echo "$as_me: not updating unwritable cache $cache_file" >&6;} | |
| fi | |
| fi | |
| rm -f confcache | |
| @@ -21368,32 +22450,18 @@ | |
| # Let make expand exec_prefix. | |
| test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' | |
| -# VPATH may cause trouble with some makes, so we remove $(srcdir), | |
| -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | |
| -# trailing colons and then remove the whole line if VPATH becomes empty | |
| -# (actually we leave an empty line to preserve line numbers). | |
| -if test "x$srcdir" = x.; then | |
| - ac_vpsub='/^[ ]*VPATH[ ]*=/{ | |
| -s/:*\$(srcdir):*/:/; | |
| -s/:*\${srcdir}:*/:/; | |
| -s/:*@srcdir@:*/:/; | |
| -s/^\([^=]*=[ ]*\):*/\1/; | |
| -s/:*$//; | |
| -s/^[^=]*=[ ]*$//; | |
| -}' | |
| -fi | |
| - | |
| DEFS=-DHAVE_CONFIG_H | |
| ac_libobjs= | |
| ac_ltlibobjs= | |
| for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | |
| # 1. Remove the extension, and $U if already installed. | |
| - ac_i=`echo "$ac_i" | | |
| - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` | |
| - # 2. Add them. | |
| - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" | |
| - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' | |
| + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | |
| + ac_i=`echo "$ac_i" | sed "$ac_script"` | |
| + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR | |
| + # will be set to the directory where LIBOBJS objects are built. | |
| + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" | |
| + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' | |
| done | |
| LIBOBJS=$ac_libobjs | |
| @@ -21459,17 +22527,45 @@ | |
| ## M4sh Initialization. ## | |
| ## --------------------- ## | |
| -# Be Bourne compatible | |
| +# Be more Bourne compatible | |
| +DUALCASE=1; export DUALCASE # for MKS sh | |
| if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then | |
| emulate sh | |
| NULLCMD=: | |
| # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which | |
| # is contrary to our usage. Disable this feature. | |
| alias -g '${1+"$@"}'='"$@"' | |
| -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then | |
| - set -o posix | |
| + setopt NO_GLOB_SUBST | |
| +else | |
| + case `(set -o) 2>/dev/null` in | |
| + *posix*) set -o posix ;; | |
| +esac | |
| + | |
| +fi | |
| + | |
| + | |
| + | |
| + | |
| +# PATH needs CR | |
| +# Avoid depending upon Character Ranges. | |
| +as_cr_letters='abcdefghijklmnopqrstuvwxyz' | |
| +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | |
| +as_cr_Letters=$as_cr_letters$as_cr_LETTERS | |
| +as_cr_digits='0123456789' | |
| +as_cr_alnum=$as_cr_Letters$as_cr_digits | |
| + | |
| +# The user is always right. | |
| +if test "${PATH_SEPARATOR+set}" != set; then | |
| + echo "#! /bin/sh" >conf$$.sh | |
| + echo "exit 0" >>conf$$.sh | |
| + chmod +x conf$$.sh | |
| + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |
| + PATH_SEPARATOR=';' | |
| + else | |
| + PATH_SEPARATOR=: | |
| + fi | |
| + rm -f conf$$.sh | |
| fi | |
| -DUALCASE=1; export DUALCASE # for MKS sh | |
| # Support unset when possible. | |
| if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then | |
| @@ -21479,8 +22575,43 @@ | |
| fi | |
| +# IFS | |
| +# We need space, tab and new line, in precisely that order. Quoting is | |
| +# there to prevent editors from complaining about space-tab. | |
| +# (If _AS_PATH_WALK were called with IFS unset, it would disable word | |
| +# splitting by setting IFS to empty value.) | |
| +as_nl=' | |
| +' | |
| +IFS=" "" $as_nl" | |
| + | |
| +# Find who we are. Look in the path if we contain no directory separator. | |
| +case $0 in | |
| + *[\\/]* ) as_myself=$0 ;; | |
| + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| +for as_dir in $PATH | |
| +do | |
| + IFS=$as_save_IFS | |
| + test -z "$as_dir" && as_dir=. | |
| + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | |
| +done | |
| +IFS=$as_save_IFS | |
| + | |
| + ;; | |
| +esac | |
| +# We did not find ourselves, most probably we were run as `sh COMMAND' | |
| +# in which case we are not to be found in the path. | |
| +if test "x$as_myself" = x; then | |
| + as_myself=$0 | |
| +fi | |
| +if test ! -f "$as_myself"; then | |
| + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 | |
| + { (exit 1); exit 1; } | |
| +fi | |
| + | |
| # Work around bugs in pre-3.0 UWIN ksh. | |
| -$as_unset ENV MAIL MAILPATH | |
| +for as_var in ENV MAIL MAILPATH | |
| +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
| +done | |
| PS1='$ ' | |
| PS2='> ' | |
| PS4='+ ' | |
| @@ -21494,18 +22625,19 @@ | |
| if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then | |
| eval $as_var=C; export $as_var | |
| else | |
| - $as_unset $as_var | |
| + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var | |
| fi | |
| done | |
| # Required to use basename. | |
| -if expr a : '\(a\)' >/dev/null 2>&1; then | |
| +if expr a : '\(a\)' >/dev/null 2>&1 && | |
| + test "X`expr 00001 : '.*\(...\)'`" = X001; then | |
| as_expr=expr | |
| else | |
| as_expr=false | |
| fi | |
| -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then | |
| +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then | |
| as_basename=basename | |
| else | |
| as_basename=false | |
| @@ -21513,159 +22645,120 @@ | |
| # Name of the executable. | |
| -as_me=`$as_basename "$0" || | |
| +as_me=`$as_basename -- "$0" || | |
| $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ | |
| X"$0" : 'X\(//\)$' \| \ | |
| - X"$0" : 'X\(/\)$' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$0" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X/"$0" | | |
| - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } | |
| - /^X\/\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\/\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| - | |
| + sed '/^.*\/\([^/][^/]*\)\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\/\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\/\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| -# PATH needs CR, and LINENO needs CR and PATH. | |
| -# Avoid depending upon Character Ranges. | |
| -as_cr_letters='abcdefghijklmnopqrstuvwxyz' | |
| -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' | |
| -as_cr_Letters=$as_cr_letters$as_cr_LETTERS | |
| -as_cr_digits='0123456789' | |
| -as_cr_alnum=$as_cr_Letters$as_cr_digits | |
| +# CDPATH. | |
| +$as_unset CDPATH | |
| -# The user is always right. | |
| -if test "${PATH_SEPARATOR+set}" != set; then | |
| - echo "#! /bin/sh" >conf$$.sh | |
| - echo "exit 0" >>conf$$.sh | |
| - chmod +x conf$$.sh | |
| - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |
| - PATH_SEPARATOR=';' | |
| - else | |
| - PATH_SEPARATOR=: | |
| - fi | |
| - rm -f conf$$.sh | |
| -fi | |
| as_lineno_1=$LINENO | |
| as_lineno_2=$LINENO | |
| - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | |
| test "x$as_lineno_1" != "x$as_lineno_2" && | |
| - test "x$as_lineno_3" = "x$as_lineno_2" || { | |
| - # Find who we are. Look in the path if we contain no path at all | |
| - # relative or not. | |
| - case $0 in | |
| - *[\\/]* ) as_myself=$0 ;; | |
| - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in $PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break | |
| -done | |
| - | |
| - ;; | |
| - esac | |
| - # We did not find ourselves, most probably we were run as `sh COMMAND' | |
| - # in which case we are not to be found in the path. | |
| - if test "x$as_myself" = x; then | |
| - as_myself=$0 | |
| - fi | |
| - if test ! -f "$as_myself"; then | |
| - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 | |
| -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} | |
| - { (exit 1); exit 1; }; } | |
| - fi | |
| - case $CONFIG_SHELL in | |
| - '') | |
| - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
| -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH | |
| -do | |
| - IFS=$as_save_IFS | |
| - test -z "$as_dir" && as_dir=. | |
| - for as_base in sh bash ksh sh5; do | |
| - case $as_dir in | |
| - /*) | |
| - if ("$as_dir/$as_base" -c ' | |
| - as_lineno_1=$LINENO | |
| - as_lineno_2=$LINENO | |
| - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` | |
| - test "x$as_lineno_1" != "x$as_lineno_2" && | |
| - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then | |
| - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } | |
| - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } | |
| - CONFIG_SHELL=$as_dir/$as_base | |
| - export CONFIG_SHELL | |
| - exec "$CONFIG_SHELL" "$0" ${1+"$@"} | |
| - fi;; | |
| - esac | |
| - done | |
| -done | |
| -;; | |
| - esac | |
| + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { | |
| # Create $as_me.lineno as a copy of $as_myself, but with $LINENO | |
| # uniformly replaced by the line number. The first 'sed' inserts a | |
| - # line-number line before each line; the second 'sed' does the real | |
| - # work. The second script uses 'N' to pair each line-number line | |
| - # with the numbered line, and appends trailing '-' during | |
| - # substitution so that $LINENO is not a special case at line end. | |
| + # line-number line after each line using $LINENO; the second 'sed' | |
| + # does the real work. The second script uses 'N' to pair each | |
| + # line-number line with the line containing $LINENO, and appends | |
| + # trailing '-' during substitution so that $LINENO is not a special | |
| + # case at line end. | |
| # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the | |
| - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) | |
| - sed '=' <$as_myself | | |
| + # scripts with optimization help from Paolo Bonzini. Blame Lee | |
| + # E. McMahon (1931-1989) for sed's syntax. :-) | |
| + sed -n ' | |
| + p | |
| + /[$]LINENO/= | |
| + ' <$as_myself | | |
| sed ' | |
| + s/[$]LINENO.*/&-/ | |
| + t lineno | |
| + b | |
| + :lineno | |
| N | |
| - s,$,-, | |
| - : loop | |
| - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, | |
| + :loop | |
| + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ | |
| t loop | |
| - s,-$,, | |
| - s,^['$as_cr_digits']*\n,, | |
| + s/-\n.*// | |
| ' >$as_me.lineno && | |
| - chmod +x $as_me.lineno || | |
| - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 | |
| -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} | |
| + chmod +x "$as_me.lineno" || | |
| + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 | |
| { (exit 1); exit 1; }; } | |
| # Don't try to exec as it changes $[0], causing all sort of problems | |
| # (the dirname of $[0] is not the place where we might find the | |
| - # original and so on. Autoconf is especially sensible to this). | |
| - . ./$as_me.lineno | |
| + # original and so on. Autoconf is especially sensitive to this). | |
| + . "./$as_me.lineno" | |
| # Exit status is that of the last command. | |
| exit | |
| } | |
| -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in | |
| - *c*,-n*) ECHO_N= ECHO_C=' | |
| -' ECHO_T=' ' ;; | |
| - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; | |
| - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; | |
| +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then | |
| + as_dirname=dirname | |
| +else | |
| + as_dirname=false | |
| +fi | |
| + | |
| +ECHO_C= ECHO_N= ECHO_T= | |
| +case `echo -n x` in | |
| +-n*) | |
| + case `echo 'x\c'` in | |
| + *c*) ECHO_T=' ';; # ECHO_T is single tab character. | |
| + *) ECHO_C='\c';; | |
| + esac;; | |
| +*) | |
| + ECHO_N='-n';; | |
| esac | |
| -if expr a : '\(a\)' >/dev/null 2>&1; then | |
| +if expr a : '\(a\)' >/dev/null 2>&1 && | |
| + test "X`expr 00001 : '.*\(...\)'`" = X001; then | |
| as_expr=expr | |
| else | |
| as_expr=false | |
| fi | |
| rm -f conf$$ conf$$.exe conf$$.file | |
| +if test -d conf$$.dir; then | |
| + rm -f conf$$.dir/conf$$.file | |
| +else | |
| + rm -f conf$$.dir | |
| + mkdir conf$$.dir | |
| +fi | |
| echo >conf$$.file | |
| if ln -s conf$$.file conf$$ 2>/dev/null; then | |
| - # We could just check for DJGPP; but this test a) works b) is more generic | |
| - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). | |
| - if test -f conf$$.exe; then | |
| - # Don't use ln at all; we don't have any links | |
| + as_ln_s='ln -s' | |
| + # ... but there are two gotchas: | |
| + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. | |
| + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. | |
| + # In both cases, we have to default to `cp -p'. | |
| + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || | |
| as_ln_s='cp -p' | |
| - else | |
| - as_ln_s='ln -s' | |
| - fi | |
| elif ln conf$$.file conf$$ 2>/dev/null; then | |
| as_ln_s=ln | |
| else | |
| as_ln_s='cp -p' | |
| fi | |
| -rm -f conf$$ conf$$.exe conf$$.file | |
| +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file | |
| +rmdir conf$$.dir 2>/dev/null | |
| if mkdir -p . 2>/dev/null; then | |
| as_mkdir_p=: | |
| @@ -21674,7 +22767,28 @@ | |
| as_mkdir_p=false | |
| fi | |
| -as_executable_p="test -f" | |
| +if test -x / >/dev/null 2>&1; then | |
| + as_test_x='test -x' | |
| +else | |
| + if ls -dL / >/dev/null 2>&1; then | |
| + as_ls_L_option=L | |
| + else | |
| + as_ls_L_option= | |
| + fi | |
| + as_test_x=' | |
| + eval sh -c '\'' | |
| + if test -d "$1"; then | |
| + test -d "$1/."; | |
| + else | |
| + case $1 in | |
| + -*)set "./$1";; | |
| + esac; | |
| + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in | |
| + ???[sx]*):;;*)false;;esac;fi | |
| + '\'' sh | |
| + ' | |
| +fi | |
| +as_executable_p=$as_test_x | |
| # Sed expression to map a string onto a valid CPP name. | |
| as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" | |
| @@ -21683,31 +22797,14 @@ | |
| as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" | |
| -# IFS | |
| -# We need space, tab and new line, in precisely that order. | |
| -as_nl=' | |
| -' | |
| -IFS=" $as_nl" | |
| - | |
| -# CDPATH. | |
| -$as_unset CDPATH | |
| - | |
| exec 6>&1 | |
| -# Open the log real soon, to keep \$[0] and so on meaningful, and to | |
| +# Save the log message, to keep $[0] and so on meaningful, and to | |
| # report actual input values of CONFIG_FILES etc. instead of their | |
| -# values after options handling. Logging --version etc. is OK. | |
| -exec 5>>config.log | |
| -{ | |
| - echo | |
| - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | |
| -## Running $as_me. ## | |
| -_ASBOX | |
| -} >&5 | |
| -cat >&5 <<_CSEOF | |
| - | |
| +# values after options handling. | |
| +ac_log=" | |
| This file was extended by sysfsutils $as_me 2.1.0, which was | |
| -generated by GNU Autoconf 2.59. Invocation command line was | |
| +generated by GNU Autoconf 2.61. Invocation command line was | |
| CONFIG_FILES = $CONFIG_FILES | |
| CONFIG_HEADERS = $CONFIG_HEADERS | |
| @@ -21715,30 +22812,20 @@ | |
| CONFIG_COMMANDS = $CONFIG_COMMANDS | |
| $ $0 $@ | |
| -_CSEOF | |
| -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 | |
| -echo >&5 | |
| +on `(hostname || uname -n) 2>/dev/null | sed 1q` | |
| +" | |
| + | |
| _ACEOF | |
| +cat >>$CONFIG_STATUS <<_ACEOF | |
| # Files that config.status was made for. | |
| -if test -n "$ac_config_files"; then | |
| - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS | |
| -fi | |
| - | |
| -if test -n "$ac_config_headers"; then | |
| - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS | |
| -fi | |
| +config_files="$ac_config_files" | |
| +config_headers="$ac_config_headers" | |
| +config_commands="$ac_config_commands" | |
| -if test -n "$ac_config_links"; then | |
| - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS | |
| -fi | |
| - | |
| -if test -n "$ac_config_commands"; then | |
| - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS | |
| -fi | |
| +_ACEOF | |
| cat >>$CONFIG_STATUS <<\_ACEOF | |
| - | |
| ac_cs_usage="\ | |
| \`$as_me' instantiates files from templates according to the | |
| current configuration. | |
| @@ -21746,7 +22833,7 @@ | |
| Usage: $0 [OPTIONS] [FILE]... | |
| -h, --help print this help, then exit | |
| - -V, --version print version number, then exit | |
| + -V, --version print version number and configuration settings, then exit | |
| -q, --quiet do not print progress messages | |
| -d, --debug don't remove temporary files | |
| --recheck update $as_me by reconfiguring in the same conditions | |
| @@ -21765,19 +22852,22 @@ | |
| $config_commands | |
| Report bugs to <bug-autoconf@gnu.org>." | |
| -_ACEOF | |
| +_ACEOF | |
| cat >>$CONFIG_STATUS <<_ACEOF | |
| ac_cs_version="\\ | |
| sysfsutils config.status 2.1.0 | |
| -configured by $0, generated by GNU Autoconf 2.59, | |
| - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" | |
| +configured by $0, generated by GNU Autoconf 2.61, | |
| + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" | |
| -Copyright (C) 2003 Free Software Foundation, Inc. | |
| +Copyright (C) 2006 Free Software Foundation, Inc. | |
| This config.status script is free software; the Free Software Foundation | |
| gives unlimited permission to copy, distribute and modify it." | |
| -srcdir=$srcdir | |
| -INSTALL="$INSTALL" | |
| + | |
| +ac_pwd='$ac_pwd' | |
| +srcdir='$srcdir' | |
| +INSTALL='$INSTALL' | |
| +MKDIR_P='$MKDIR_P' | |
| _ACEOF | |
| cat >>$CONFIG_STATUS <<\_ACEOF | |
| @@ -21788,39 +22878,24 @@ | |
| do | |
| case $1 in | |
| --*=*) | |
| - ac_option=`expr "x$1" : 'x\([^=]*\)='` | |
| - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` | |
| + ac_option=`expr "X$1" : 'X\([^=]*\)='` | |
| + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` | |
| ac_shift=: | |
| ;; | |
| - -*) | |
| + *) | |
| ac_option=$1 | |
| ac_optarg=$2 | |
| ac_shift=shift | |
| ;; | |
| - *) # This is not an option, so the user has probably given explicit | |
| - # arguments. | |
| - ac_option=$1 | |
| - ac_need_defaults=false;; | |
| esac | |
| case $ac_option in | |
| # Handling of the options. | |
| -_ACEOF | |
| -cat >>$CONFIG_STATUS <<\_ACEOF | |
| -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) | |
| ac_cs_recheck=: ;; | |
| - --version | --vers* | -V ) | |
| - echo "$ac_cs_version"; exit 0 ;; | |
| - --he | --h) | |
| - # Conflict between --help and --header | |
| - { { echo "$as_me:$LINENO: error: ambiguous option: $1 | |
| -Try \`$0 --help' for more information." >&5 | |
| -echo "$as_me: error: ambiguous option: $1 | |
| -Try \`$0 --help' for more information." >&2;} | |
| - { (exit 1); exit 1; }; };; | |
| - --help | --hel | -h ) | |
| - echo "$ac_cs_usage"; exit 0 ;; | |
| - --debug | --d* | -d ) | |
| + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) | |
| + echo "$ac_cs_version"; exit ;; | |
| + --debug | --debu | --deb | --de | --d | -d ) | |
| debug=: ;; | |
| --file | --fil | --fi | --f ) | |
| $ac_shift | |
| @@ -21830,18 +22905,24 @@ | |
| $ac_shift | |
| CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" | |
| ac_need_defaults=false;; | |
| + --he | --h) | |
| + # Conflict between --help and --header | |
| + { echo "$as_me: error: ambiguous option: $1 | |
| +Try \`$0 --help' for more information." >&2 | |
| + { (exit 1); exit 1; }; };; | |
| + --help | --hel | -h ) | |
| + echo "$ac_cs_usage"; exit ;; | |
| -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | |
| | -silent | --silent | --silen | --sile | --sil | --si | --s) | |
| ac_cs_silent=: ;; | |
| # This is an error. | |
| - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 | |
| -Try \`$0 --help' for more information." >&5 | |
| -echo "$as_me: error: unrecognized option: $1 | |
| -Try \`$0 --help' for more information." >&2;} | |
| + -*) { echo "$as_me: error: unrecognized option: $1 | |
| +Try \`$0 --help' for more information." >&2 | |
| { (exit 1); exit 1; }; } ;; | |
| - *) ac_config_targets="$ac_config_targets $1" ;; | |
| + *) ac_config_targets="$ac_config_targets $1" | |
| + ac_need_defaults=false ;; | |
| esac | |
| shift | |
| @@ -21857,40 +22938,53 @@ | |
| _ACEOF | |
| cat >>$CONFIG_STATUS <<_ACEOF | |
| if \$ac_cs_recheck; then | |
| - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | |
| - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | |
| + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 | |
| + CONFIG_SHELL=$SHELL | |
| + export CONFIG_SHELL | |
| + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | |
| fi | |
| _ACEOF | |
| +cat >>$CONFIG_STATUS <<\_ACEOF | |
| +exec 5>>config.log | |
| +{ | |
| + echo | |
| + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX | |
| +## Running $as_me. ## | |
| +_ASBOX | |
| + echo "$ac_log" | |
| +} >&5 | |
| +_ACEOF | |
| cat >>$CONFIG_STATUS <<_ACEOF | |
| # | |
| -# INIT-COMMANDS section. | |
| +# INIT-COMMANDS | |
| # | |
| - | |
| AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" | |
| _ACEOF | |
| - | |
| - | |
| cat >>$CONFIG_STATUS <<\_ACEOF | |
| + | |
| +# Handling of arguments. | |
| for ac_config_target in $ac_config_targets | |
| do | |
| - case "$ac_config_target" in | |
| - # Handling of arguments. | |
| - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; | |
| - "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; | |
| - "cmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;; | |
| - "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; | |
| - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; | |
| - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; | |
| + case $ac_config_target in | |
| + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; | |
| + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; | |
| + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | |
| + "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; | |
| + "cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;; | |
| + "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; | |
| + "test/create-test.sh") CONFIG_FILES="$CONFIG_FILES test/create-test.sh" ;; | |
| + | |
| *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 | |
| echo "$as_me: error: invalid argument: $ac_config_target" >&2;} | |
| { (exit 1); exit 1; }; };; | |
| esac | |
| done | |
| + | |
| # If the user did not use the arguments to specify the items to instantiate, | |
| # then the envvar interface is used. Set only those that are not. | |
| # We use the long form for the default assignment because of an extremely | |
| @@ -21902,744 +22996,647 @@ | |
| fi | |
| # Have a temporary directory for convenience. Make it in the build tree | |
| -# simply because there is no reason to put it here, and in addition, | |
| +# simply because there is no reason against having it here, and in addition, | |
| # creating and moving files from /tmp can sometimes cause problems. | |
| -# Create a temporary directory, and hook for its removal unless debugging. | |
| +# Hook for its removal unless debugging. | |
| +# Note that there is a small window in which the directory will not be cleaned: | |
| +# after its creation but before its name has been assigned to `$tmp'. | |
| $debug || | |
| { | |
| - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 | |
| + tmp= | |
| + trap 'exit_status=$? | |
| + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status | |
| +' 0 | |
| trap '{ (exit 1); exit 1; }' 1 2 13 15 | |
| } | |
| - | |
| # Create a (secure) tmp directory for tmp files. | |
| { | |
| - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && | |
| + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && | |
| test -n "$tmp" && test -d "$tmp" | |
| } || | |
| { | |
| - tmp=./confstat$$-$RANDOM | |
| - (umask 077 && mkdir $tmp) | |
| + tmp=./conf$$-$RANDOM | |
| + (umask 077 && mkdir "$tmp") | |
| } || | |
| { | |
| echo "$me: cannot create a temporary directory in ." >&2 | |
| { (exit 1); exit 1; } | |
| } | |
| -_ACEOF | |
| - | |
| -cat >>$CONFIG_STATUS <<_ACEOF | |
| - | |
| # | |
| -# CONFIG_FILES section. | |
| +# Set up the sed scripts for CONFIG_FILES section. | |
| # | |
| # No need to generate the scripts if there are no CONFIG_FILES. | |
| # This happens for instance when ./config.status config.h | |
| -if test -n "\$CONFIG_FILES"; then | |
| - # Protect against being on the right side of a sed subst in config.status. | |
| - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; | |
| - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF | |
| -s,@SHELL@,$SHELL,;t t | |
| -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t | |
| -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t | |
| -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t | |
| -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t | |
| -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t | |
| -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t | |
| -s,@exec_prefix@,$exec_prefix,;t t | |
| -s,@prefix@,$prefix,;t t | |
| -s,@program_transform_name@,$program_transform_name,;t t | |
| -s,@bindir@,$bindir,;t t | |
| -s,@sbindir@,$sbindir,;t t | |
| -s,@libexecdir@,$libexecdir,;t t | |
| -s,@datadir@,$datadir,;t t | |
| -s,@sysconfdir@,$sysconfdir,;t t | |
| -s,@sharedstatedir@,$sharedstatedir,;t t | |
| -s,@localstatedir@,$localstatedir,;t t | |
| -s,@libdir@,$libdir,;t t | |
| -s,@includedir@,$includedir,;t t | |
| -s,@oldincludedir@,$oldincludedir,;t t | |
| -s,@infodir@,$infodir,;t t | |
| -s,@mandir@,$mandir,;t t | |
| -s,@build_alias@,$build_alias,;t t | |
| -s,@host_alias@,$host_alias,;t t | |
| -s,@target_alias@,$target_alias,;t t | |
| -s,@DEFS@,$DEFS,;t t | |
| -s,@ECHO_C@,$ECHO_C,;t t | |
| -s,@ECHO_N@,$ECHO_N,;t t | |
| -s,@ECHO_T@,$ECHO_T,;t t | |
| -s,@LIBS@,$LIBS,;t t | |
| -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t | |
| -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t | |
| -s,@INSTALL_DATA@,$INSTALL_DATA,;t t | |
| -s,@CYGPATH_W@,$CYGPATH_W,;t t | |
| -s,@PACKAGE@,$PACKAGE,;t t | |
| -s,@VERSION@,$VERSION,;t t | |
| -s,@ACLOCAL@,$ACLOCAL,;t t | |
| -s,@AUTOCONF@,$AUTOCONF,;t t | |
| -s,@AUTOMAKE@,$AUTOMAKE,;t t | |
| -s,@AUTOHEADER@,$AUTOHEADER,;t t | |
| -s,@MAKEINFO@,$MAKEINFO,;t t | |
| -s,@install_sh@,$install_sh,;t t | |
| -s,@STRIP@,$STRIP,;t t | |
| -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t | |
| -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t | |
| -s,@mkdir_p@,$mkdir_p,;t t | |
| -s,@AWK@,$AWK,;t t | |
| -s,@SET_MAKE@,$SET_MAKE,;t t | |
| -s,@am__leading_dot@,$am__leading_dot,;t t | |
| -s,@AMTAR@,$AMTAR,;t t | |
| -s,@am__tar@,$am__tar,;t t | |
| -s,@am__untar@,$am__untar,;t t | |
| -s,@build@,$build,;t t | |
| -s,@build_cpu@,$build_cpu,;t t | |
| -s,@build_vendor@,$build_vendor,;t t | |
| -s,@build_os@,$build_os,;t t | |
| -s,@host@,$host,;t t | |
| -s,@host_cpu@,$host_cpu,;t t | |
| -s,@host_vendor@,$host_vendor,;t t | |
| -s,@host_os@,$host_os,;t t | |
| -s,@KLCC@,$KLCC,;t t | |
| -s,@KLIBC@,$KLIBC,;t t | |
| -s,@KLIBC_TRUE@,$KLIBC_TRUE,;t t | |
| -s,@KLIBC_FALSE@,$KLIBC_FALSE,;t t | |
| -s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t | |
| -s,@CC@,$CC,;t t | |
| -s,@CFLAGS@,$CFLAGS,;t t | |
| -s,@LDFLAGS@,$LDFLAGS,;t t | |
| -s,@CPPFLAGS@,$CPPFLAGS,;t t | |
| -s,@ac_ct_CC@,$ac_ct_CC,;t t | |
| -s,@EXEEXT@,$EXEEXT,;t t | |
| -s,@OBJEXT@,$OBJEXT,;t t | |
| -s,@DEPDIR@,$DEPDIR,;t t | |
| -s,@am__include@,$am__include,;t t | |
| -s,@am__quote@,$am__quote,;t t | |
| -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t | |
| -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t | |
| -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t | |
| -s,@CCDEPMODE@,$CCDEPMODE,;t t | |
| -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t | |
| -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t | |
| -s,@EGREP@,$EGREP,;t t | |
| -s,@LN_S@,$LN_S,;t t | |
| -s,@ECHO@,$ECHO,;t t | |
| -s,@AR@,$AR,;t t | |
| -s,@ac_ct_AR@,$ac_ct_AR,;t t | |
| -s,@RANLIB@,$RANLIB,;t t | |
| -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t | |
| -s,@CPP@,$CPP,;t t | |
| -s,@CXX@,$CXX,;t t | |
| -s,@CXXFLAGS@,$CXXFLAGS,;t t | |
| -s,@ac_ct_CXX@,$ac_ct_CXX,;t t | |
| -s,@CXXDEPMODE@,$CXXDEPMODE,;t t | |
| -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t | |
| -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t | |
| -s,@CXXCPP@,$CXXCPP,;t t | |
| -s,@F77@,$F77,;t t | |
| -s,@FFLAGS@,$FFLAGS,;t t | |
| -s,@ac_ct_F77@,$ac_ct_F77,;t t | |
| -s,@LIBTOOL@,$LIBTOOL,;t t | |
| -s,@LIBOBJS@,$LIBOBJS,;t t | |
| -s,@LTLIBOBJS@,$LTLIBOBJS,;t t | |
| -CEOF | |
| - | |
| -_ACEOF | |
| - | |
| - cat >>$CONFIG_STATUS <<\_ACEOF | |
| - # Split the substitutions into bite-sized pieces for seds with | |
| - # small command number limits, like on Digital OSF/1 and HP-UX. | |
| - ac_max_sed_lines=48 | |
| - ac_sed_frag=1 # Number of current file. | |
| - ac_beg=1 # First line for current file. | |
| - ac_end=$ac_max_sed_lines # Line after last line for current file. | |
| - ac_more_lines=: | |
| - ac_sed_cmds= | |
| - while $ac_more_lines; do | |
| - if test $ac_beg -gt 1; then | |
| - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | |
| - else | |
| - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag | |
| - fi | |
| - if test ! -s $tmp/subs.frag; then | |
| - ac_more_lines=false | |
| - else | |
| - # The purpose of the label and of the branching condition is to | |
| - # speed up the sed processing (if there are no `@' at all, there | |
| - # is no need to browse any of the substitutions). | |
| - # These are the two extra sed commands mentioned above. | |
| - (echo ':t | |
| - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed | |
| - if test -z "$ac_sed_cmds"; then | |
| - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" | |
| - else | |
| - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" | |
| - fi | |
| - ac_sed_frag=`expr $ac_sed_frag + 1` | |
| - ac_beg=$ac_end | |
| - ac_end=`expr $ac_end + $ac_max_sed_lines` | |
| - fi | |
| - done | |
| - if test -z "$ac_sed_cmds"; then | |
| - ac_sed_cmds=cat | |
| +if test -n "$CONFIG_FILES"; then | |
| + | |
| +_ACEOF | |
| + | |
| + | |
| + | |
| +ac_delim='%!_!# ' | |
| +for ac_last_try in false false false false false :; do | |
| + cat >conf$$subs.sed <<_ACEOF | |
| +SHELL!$SHELL$ac_delim | |
| +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim | |
| +PACKAGE_NAME!$PACKAGE_NAME$ac_delim | |
| +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim | |
| +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim | |
| +PACKAGE_STRING!$PACKAGE_STRING$ac_delim | |
| +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim | |
| +exec_prefix!$exec_prefix$ac_delim | |
| +prefix!$prefix$ac_delim | |
| +program_transform_name!$program_transform_name$ac_delim | |
| +bindir!$bindir$ac_delim | |
| +sbindir!$sbindir$ac_delim | |
| +libexecdir!$libexecdir$ac_delim | |
| +datarootdir!$datarootdir$ac_delim | |
| +datadir!$datadir$ac_delim | |
| +sysconfdir!$sysconfdir$ac_delim | |
| +sharedstatedir!$sharedstatedir$ac_delim | |
| +localstatedir!$localstatedir$ac_delim | |
| +includedir!$includedir$ac_delim | |
| +oldincludedir!$oldincludedir$ac_delim | |
| +docdir!$docdir$ac_delim | |
| +infodir!$infodir$ac_delim | |
| +htmldir!$htmldir$ac_delim | |
| +dvidir!$dvidir$ac_delim | |
| +pdfdir!$pdfdir$ac_delim | |
| +psdir!$psdir$ac_delim | |
| +libdir!$libdir$ac_delim | |
| +localedir!$localedir$ac_delim | |
| +mandir!$mandir$ac_delim | |
| +DEFS!$DEFS$ac_delim | |
| +ECHO_C!$ECHO_C$ac_delim | |
| +ECHO_N!$ECHO_N$ac_delim | |
| +ECHO_T!$ECHO_T$ac_delim | |
| +LIBS!$LIBS$ac_delim | |
| +build_alias!$build_alias$ac_delim | |
| +host_alias!$host_alias$ac_delim | |
| +target_alias!$target_alias$ac_delim | |
| +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim | |
| +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim | |
| +INSTALL_DATA!$INSTALL_DATA$ac_delim | |
| +am__isrc!$am__isrc$ac_delim | |
| +CYGPATH_W!$CYGPATH_W$ac_delim | |
| +PACKAGE!$PACKAGE$ac_delim | |
| +VERSION!$VERSION$ac_delim | |
| +ACLOCAL!$ACLOCAL$ac_delim | |
| +AUTOCONF!$AUTOCONF$ac_delim | |
| +AUTOMAKE!$AUTOMAKE$ac_delim | |
| +AUTOHEADER!$AUTOHEADER$ac_delim | |
| +MAKEINFO!$MAKEINFO$ac_delim | |
| +install_sh!$install_sh$ac_delim | |
| +STRIP!$STRIP$ac_delim | |
| +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim | |
| +mkdir_p!$mkdir_p$ac_delim | |
| +AWK!$AWK$ac_delim | |
| +SET_MAKE!$SET_MAKE$ac_delim | |
| +am__leading_dot!$am__leading_dot$ac_delim | |
| +AMTAR!$AMTAR$ac_delim | |
| +am__tar!$am__tar$ac_delim | |
| +am__untar!$am__untar$ac_delim | |
| +build!$build$ac_delim | |
| +build_cpu!$build_cpu$ac_delim | |
| +build_vendor!$build_vendor$ac_delim | |
| +build_os!$build_os$ac_delim | |
| +host!$host$ac_delim | |
| +host_cpu!$host_cpu$ac_delim | |
| +host_vendor!$host_vendor$ac_delim | |
| +host_os!$host_os$ac_delim | |
| +KLCC!$KLCC$ac_delim | |
| +KLIBC!$KLIBC$ac_delim | |
| +KLIBC_TRUE!$KLIBC_TRUE$ac_delim | |
| +KLIBC_FALSE!$KLIBC_FALSE$ac_delim | |
| +EXTRA_CFLAGS!$EXTRA_CFLAGS$ac_delim | |
| +CC!$CC$ac_delim | |
| +CFLAGS!$CFLAGS$ac_delim | |
| +LDFLAGS!$LDFLAGS$ac_delim | |
| +CPPFLAGS!$CPPFLAGS$ac_delim | |
| +ac_ct_CC!$ac_ct_CC$ac_delim | |
| +EXEEXT!$EXEEXT$ac_delim | |
| +OBJEXT!$OBJEXT$ac_delim | |
| +DEPDIR!$DEPDIR$ac_delim | |
| +am__include!$am__include$ac_delim | |
| +am__quote!$am__quote$ac_delim | |
| +AMDEP_TRUE!$AMDEP_TRUE$ac_delim | |
| +AMDEP_FALSE!$AMDEP_FALSE$ac_delim | |
| +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim | |
| +CCDEPMODE!$CCDEPMODE$ac_delim | |
| +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim | |
| +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim | |
| +SED!$SED$ac_delim | |
| +GREP!$GREP$ac_delim | |
| +EGREP!$EGREP$ac_delim | |
| +LN_S!$LN_S$ac_delim | |
| +ECHO!$ECHO$ac_delim | |
| +AR!$AR$ac_delim | |
| +RANLIB!$RANLIB$ac_delim | |
| +DSYMUTIL!$DSYMUTIL$ac_delim | |
| +NMEDIT!$NMEDIT$ac_delim | |
| +_ACEOF | |
| + | |
| + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then | |
| + break | |
| + elif $ac_last_try; then | |
| + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
| +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | |
| + { (exit 1); exit 1; }; } | |
| + else | |
| + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | |
| fi | |
| -fi # test -n "$CONFIG_FILES" | |
| +done | |
| +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | |
| +if test -n "$ac_eof"; then | |
| + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | |
| + ac_eof=`expr $ac_eof + 1` | |
| +fi | |
| + | |
| +cat >>$CONFIG_STATUS <<_ACEOF | |
| +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof | |
| +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b | |
| +_ACEOF | |
| +sed ' | |
| +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | |
| +s/^/s,@/; s/!/@,|#_!!_#|/ | |
| +:n | |
| +t n | |
| +s/'"$ac_delim"'$/,g/; t | |
| +s/$/\\/; p | |
| +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | |
| +' >>$CONFIG_STATUS <conf$$subs.sed | |
| +rm -f conf$$subs.sed | |
| +cat >>$CONFIG_STATUS <<_ACEOF | |
| +CEOF$ac_eof | |
| _ACEOF | |
| + | |
| + | |
| +ac_delim='%!_!# ' | |
| +for ac_last_try in false false false false false :; do | |
| + cat >conf$$subs.sed <<_ACEOF | |
| +CPP!$CPP$ac_delim | |
| +CXX!$CXX$ac_delim | |
| +CXXFLAGS!$CXXFLAGS$ac_delim | |
| +ac_ct_CXX!$ac_ct_CXX$ac_delim | |
| +CXXDEPMODE!$CXXDEPMODE$ac_delim | |
| +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim | |
| +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim | |
| +CXXCPP!$CXXCPP$ac_delim | |
| +F77!$F77$ac_delim | |
| +FFLAGS!$FFLAGS$ac_delim | |
| +ac_ct_F77!$ac_ct_F77$ac_delim | |
| +LIBTOOL!$LIBTOOL$ac_delim | |
| +LIBOBJS!$LIBOBJS$ac_delim | |
| +LTLIBOBJS!$LTLIBOBJS$ac_delim | |
| +_ACEOF | |
| + | |
| + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then | |
| + break | |
| + elif $ac_last_try; then | |
| + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 | |
| +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} | |
| + { (exit 1); exit 1; }; } | |
| + else | |
| + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | |
| + fi | |
| +done | |
| + | |
| +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` | |
| +if test -n "$ac_eof"; then | |
| + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` | |
| + ac_eof=`expr $ac_eof + 1` | |
| +fi | |
| + | |
| +cat >>$CONFIG_STATUS <<_ACEOF | |
| +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof | |
| +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end | |
| +_ACEOF | |
| +sed ' | |
| +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g | |
| +s/^/s,@/; s/!/@,|#_!!_#|/ | |
| +:n | |
| +t n | |
| +s/'"$ac_delim"'$/,g/; t | |
| +s/$/\\/; p | |
| +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n | |
| +' >>$CONFIG_STATUS <conf$$subs.sed | |
| +rm -f conf$$subs.sed | |
| +cat >>$CONFIG_STATUS <<_ACEOF | |
| +:end | |
| +s/|#_!!_#|//g | |
| +CEOF$ac_eof | |
| +_ACEOF | |
| + | |
| + | |
| +# VPATH may cause trouble with some makes, so we remove $(srcdir), | |
| +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | |
| +# trailing colons and then remove the whole line if VPATH becomes empty | |
| +# (actually we leave an empty line to preserve line numbers). | |
| +if test "x$srcdir" = x.; then | |
| + ac_vpsub='/^[ ]*VPATH[ ]*=/{ | |
| +s/:*\$(srcdir):*/:/ | |
| +s/:*\${srcdir}:*/:/ | |
| +s/:*@srcdir@:*/:/ | |
| +s/^\([^=]*=[ ]*\):*/\1/ | |
| +s/:*$// | |
| +s/^[^=]*=[ ]*$// | |
| +}' | |
| +fi | |
| + | |
| cat >>$CONFIG_STATUS <<\_ACEOF | |
| -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue | |
| - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | |
| - case $ac_file in | |
| - - | *:- | *:-:* ) # input from stdin | |
| - cat >$tmp/stdin | |
| - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | |
| - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | |
| - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | |
| - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | |
| - * ) ac_file_in=$ac_file.in ;; | |
| +fi # test -n "$CONFIG_FILES" | |
| + | |
| + | |
| +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS | |
| +do | |
| + case $ac_tag in | |
| + :[FHLC]) ac_mode=$ac_tag; continue;; | |
| + esac | |
| + case $ac_mode$ac_tag in | |
| + :[FHL]*:*);; | |
| + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 | |
| +echo "$as_me: error: Invalid tag $ac_tag." >&2;} | |
| + { (exit 1); exit 1; }; };; | |
| + :[FH]-) ac_tag=-:-;; | |
| + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | |
| esac | |
| + ac_save_IFS=$IFS | |
| + IFS=: | |
| + set x $ac_tag | |
| + IFS=$ac_save_IFS | |
| + shift | |
| + ac_file=$1 | |
| + shift | |
| - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. | |
| - ac_dir=`(dirname "$ac_file") 2>/dev/null || | |
| + case $ac_mode in | |
| + :L) ac_source=$1;; | |
| + :[FH]) | |
| + ac_file_inputs= | |
| + for ac_f | |
| + do | |
| + case $ac_f in | |
| + -) ac_f="$tmp/stdin";; | |
| + *) # Look for the file first in the build tree, then in the source tree | |
| + # (if the path is not absolute). The absolute path cannot be DOS-style, | |
| + # because $ac_f cannot contain `:'. | |
| + test -f "$ac_f" || | |
| + case $ac_f in | |
| + [\\/$]*) false;; | |
| + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | |
| + esac || | |
| + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 | |
| +echo "$as_me: error: cannot find input file: $ac_f" >&2;} | |
| + { (exit 1); exit 1; }; };; | |
| + esac | |
| + ac_file_inputs="$ac_file_inputs $ac_f" | |
| + done | |
| + | |
| + # Let's still pretend it is `configure' which instantiates (i.e., don't | |
| + # use $as_me), people would be surprised to read: | |
| + # /* config.h. Generated by config.status. */ | |
| + configure_input="Generated from "`IFS=: | |
| + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." | |
| + if test x"$ac_file" != x-; then | |
| + configure_input="$ac_file. $configure_input" | |
| + { echo "$as_me:$LINENO: creating $ac_file" >&5 | |
| +echo "$as_me: creating $ac_file" >&6;} | |
| + fi | |
| + | |
| + case $ac_tag in | |
| + *:-:* | *:-) cat >"$tmp/stdin";; | |
| + esac | |
| + ;; | |
| + esac | |
| + | |
| + ac_dir=`$as_dirname -- "$ac_file" || | |
| $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| X"$ac_file" : 'X\(//\)[^/]' \| \ | |
| X"$ac_file" : 'X\(//\)$' \| \ | |
| - X"$ac_file" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X"$ac_file" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| - { if $as_mkdir_p; then | |
| - mkdir -p "$ac_dir" | |
| - else | |
| - as_dir="$ac_dir" | |
| + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)[^/].*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| + { as_dir="$ac_dir" | |
| + case $as_dir in #( | |
| + -*) as_dir=./$as_dir;; | |
| + esac | |
| + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | |
| as_dirs= | |
| - while test ! -d "$as_dir"; do | |
| - as_dirs="$as_dir $as_dirs" | |
| - as_dir=`(dirname "$as_dir") 2>/dev/null || | |
| + while :; do | |
| + case $as_dir in #( | |
| + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | |
| + *) as_qdir=$as_dir;; | |
| + esac | |
| + as_dirs="'$as_qdir' $as_dirs" | |
| + as_dir=`$as_dirname -- "$as_dir" || | |
| $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| X"$as_dir" : 'X\(//\)[^/]' \| \ | |
| X"$as_dir" : 'X\(//\)$' \| \ | |
| - X"$as_dir" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X"$as_dir" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)[^/].*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| + test -d "$as_dir" && break | |
| done | |
| - test ! -n "$as_dirs" || mkdir $as_dirs | |
| - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | |
| -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | |
| + test -z "$as_dirs" || eval "mkdir $as_dirs" | |
| + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | |
| +echo "$as_me: error: cannot create directory $as_dir" >&2;} | |
| { (exit 1); exit 1; }; }; } | |
| - | |
| ac_builddir=. | |
| -if test "$ac_dir" != .; then | |
| +case "$ac_dir" in | |
| +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
| +*) | |
| ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | |
| - # A "../" for each directory in $ac_dir_suffix. | |
| - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | |
| -else | |
| - ac_dir_suffix= ac_top_builddir= | |
| -fi | |
| + # A ".." for each directory in $ac_dir_suffix. | |
| + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` | |
| + case $ac_top_builddir_sub in | |
| + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; | |
| + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; | |
| + esac ;; | |
| +esac | |
| +ac_abs_top_builddir=$ac_pwd | |
| +ac_abs_builddir=$ac_pwd$ac_dir_suffix | |
| +# for backward compatibility: | |
| +ac_top_builddir=$ac_top_build_prefix | |
| case $srcdir in | |
| - .) # No --srcdir option. We are building in place. | |
| + .) # We are building in place. | |
| ac_srcdir=. | |
| - if test -z "$ac_top_builddir"; then | |
| - ac_top_srcdir=. | |
| - else | |
| - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | |
| - fi ;; | |
| - [\\/]* | ?:[\\/]* ) # Absolute path. | |
| + ac_top_srcdir=$ac_top_builddir_sub | |
| + ac_abs_top_srcdir=$ac_pwd ;; | |
| + [\\/]* | ?:[\\/]* ) # Absolute name. | |
| ac_srcdir=$srcdir$ac_dir_suffix; | |
| - ac_top_srcdir=$srcdir ;; | |
| - *) # Relative path. | |
| - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | |
| - ac_top_srcdir=$ac_top_builddir$srcdir ;; | |
| + ac_top_srcdir=$srcdir | |
| + ac_abs_top_srcdir=$srcdir ;; | |
| + *) # Relative name. | |
| + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix | |
| + ac_top_srcdir=$ac_top_build_prefix$srcdir | |
| + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; | |
| esac | |
| +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix | |
| -# Do not use `cd foo && pwd` to compute absolute paths, because | |
| -# the directories may not exist. | |
| -case `pwd` in | |
| -.) ac_abs_builddir="$ac_dir";; | |
| -*) | |
| - case "$ac_dir" in | |
| - .) ac_abs_builddir=`pwd`;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | |
| - *) ac_abs_builddir=`pwd`/"$ac_dir";; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_top_builddir=${ac_top_builddir}.;; | |
| -*) | |
| - case ${ac_top_builddir}. in | |
| - .) ac_abs_top_builddir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | |
| - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_srcdir=$ac_srcdir;; | |
| -*) | |
| - case $ac_srcdir in | |
| - .) ac_abs_srcdir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | |
| - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_top_srcdir=$ac_top_srcdir;; | |
| -*) | |
| - case $ac_top_srcdir in | |
| - .) ac_abs_top_srcdir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | |
| - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | |
| - esac;; | |
| -esac | |
| + case $ac_mode in | |
| + :F) | |
| + # | |
| + # CONFIG_FILE | |
| + # | |
| case $INSTALL in | |
| [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; | |
| - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; | |
| + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; | |
| + esac | |
| + ac_MKDIR_P=$MKDIR_P | |
| + case $MKDIR_P in | |
| + [\\/$]* | ?:[\\/]* ) ;; | |
| + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; | |
| esac | |
| +_ACEOF | |
| - if test x"$ac_file" != x-; then | |
| - { echo "$as_me:$LINENO: creating $ac_file" >&5 | |
| -echo "$as_me: creating $ac_file" >&6;} | |
| - rm -f "$ac_file" | |
| - fi | |
| - # Let's still pretend it is `configure' which instantiates (i.e., don't | |
| - # use $as_me), people would be surprised to read: | |
| - # /* config.h. Generated by config.status. */ | |
| - if test x"$ac_file" = x-; then | |
| - configure_input= | |
| - else | |
| - configure_input="$ac_file. " | |
| - fi | |
| - configure_input=$configure_input"Generated from `echo $ac_file_in | | |
| - sed 's,.*/,,'` by configure." | |
| - | |
| - # First look for the input files in the build tree, otherwise in the | |
| - # src tree. | |
| - ac_file_inputs=`IFS=: | |
| - for f in $ac_file_in; do | |
| - case $f in | |
| - -) echo $tmp/stdin ;; | |
| - [\\/$]*) | |
| - # Absolute (can't be DOS-style, as IFS=:) | |
| - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | |
| -echo "$as_me: error: cannot find input file: $f" >&2;} | |
| - { (exit 1); exit 1; }; } | |
| - echo "$f";; | |
| - *) # Relative | |
| - if test -f "$f"; then | |
| - # Build tree | |
| - echo "$f" | |
| - elif test -f "$srcdir/$f"; then | |
| - # Source tree | |
| - echo "$srcdir/$f" | |
| - else | |
| - # /dev/null tree | |
| - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | |
| -echo "$as_me: error: cannot find input file: $f" >&2;} | |
| - { (exit 1); exit 1; }; } | |
| - fi;; | |
| - esac | |
| - done` || { (exit 1); exit 1; } | |
| +cat >>$CONFIG_STATUS <<\_ACEOF | |
| +# If the template does not know about datarootdir, expand it. | |
| +# FIXME: This hack should be removed a few years after 2.60. | |
| +ac_datarootdir_hack=; ac_datarootdir_seen= | |
| + | |
| +case `sed -n '/datarootdir/ { | |
| + p | |
| + q | |
| +} | |
| +/@datadir@/p | |
| +/@docdir@/p | |
| +/@infodir@/p | |
| +/@localedir@/p | |
| +/@mandir@/p | |
| +' $ac_file_inputs` in | |
| +*datarootdir*) ac_datarootdir_seen=yes;; | |
| +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) | |
| + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 | |
| +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} | |
| _ACEOF | |
| cat >>$CONFIG_STATUS <<_ACEOF | |
| + ac_datarootdir_hack=' | |
| + s&@datadir@&$datadir&g | |
| + s&@docdir@&$docdir&g | |
| + s&@infodir@&$infodir&g | |
| + s&@localedir@&$localedir&g | |
| + s&@mandir@&$mandir&g | |
| + s&\\\${datarootdir}&$datarootdir&g' ;; | |
| +esac | |
| +_ACEOF | |
| + | |
| +# Neutralize VPATH when `$srcdir' = `.'. | |
| +# Shell code in configure.ac might set extrasub. | |
| +# FIXME: do we really want to maintain this feature? | |
| +cat >>$CONFIG_STATUS <<_ACEOF | |
| sed "$ac_vpsub | |
| $extrasub | |
| _ACEOF | |
| cat >>$CONFIG_STATUS <<\_ACEOF | |
| :t | |
| /@[a-zA-Z_][a-zA-Z_0-9]*@/!b | |
| -s,@configure_input@,$configure_input,;t t | |
| -s,@srcdir@,$ac_srcdir,;t t | |
| -s,@abs_srcdir@,$ac_abs_srcdir,;t t | |
| -s,@top_srcdir@,$ac_top_srcdir,;t t | |
| -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t | |
| -s,@builddir@,$ac_builddir,;t t | |
| -s,@abs_builddir@,$ac_abs_builddir,;t t | |
| -s,@top_builddir@,$ac_top_builddir,;t t | |
| -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t | |
| -s,@INSTALL@,$ac_INSTALL,;t t | |
| -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out | |
| - rm -f $tmp/stdin | |
| - if test x"$ac_file" != x-; then | |
| - mv $tmp/out $ac_file | |
| - else | |
| - cat $tmp/out | |
| - rm -f $tmp/out | |
| - fi | |
| - | |
| -done | |
| -_ACEOF | |
| -cat >>$CONFIG_STATUS <<\_ACEOF | |
| +s&@configure_input@&$configure_input&;t t | |
| +s&@top_builddir@&$ac_top_builddir_sub&;t t | |
| +s&@srcdir@&$ac_srcdir&;t t | |
| +s&@abs_srcdir@&$ac_abs_srcdir&;t t | |
| +s&@top_srcdir@&$ac_top_srcdir&;t t | |
| +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t | |
| +s&@builddir@&$ac_builddir&;t t | |
| +s&@abs_builddir@&$ac_abs_builddir&;t t | |
| +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t | |
| +s&@INSTALL@&$ac_INSTALL&;t t | |
| +s&@MKDIR_P@&$ac_MKDIR_P&;t t | |
| +$ac_datarootdir_hack | |
| +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out | |
| + | |
| +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | |
| + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | |
| + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | |
| + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' | |
| +which seems to be undefined. Please make sure it is defined." >&5 | |
| +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | |
| +which seems to be undefined. Please make sure it is defined." >&2;} | |
| -# | |
| -# CONFIG_HEADER section. | |
| -# | |
| - | |
| -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where | |
| -# NAME is the cpp macro being defined and VALUE is the value it is being given. | |
| -# | |
| -# ac_d sets the value in "#define NAME VALUE" lines. | |
| -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' | |
| -ac_dB='[ ].*$,\1#\2' | |
| -ac_dC=' ' | |
| -ac_dD=',;t' | |
| -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". | |
| -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' | |
| -ac_uB='$,\1#\2define\3' | |
| -ac_uC=' ' | |
| -ac_uD=',;t' | |
| - | |
| -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue | |
| - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". | |
| + rm -f "$tmp/stdin" | |
| case $ac_file in | |
| - - | *:- | *:-:* ) # input from stdin | |
| - cat >$tmp/stdin | |
| - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | |
| - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | |
| - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` | |
| - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; | |
| - * ) ac_file_in=$ac_file.in ;; | |
| + -) cat "$tmp/out"; rm -f "$tmp/out";; | |
| + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; | |
| esac | |
| - | |
| - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 | |
| -echo "$as_me: creating $ac_file" >&6;} | |
| - | |
| - # First look for the input files in the build tree, otherwise in the | |
| - # src tree. | |
| - ac_file_inputs=`IFS=: | |
| - for f in $ac_file_in; do | |
| - case $f in | |
| - -) echo $tmp/stdin ;; | |
| - [\\/$]*) | |
| - # Absolute (can't be DOS-style, as IFS=:) | |
| - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | |
| -echo "$as_me: error: cannot find input file: $f" >&2;} | |
| - { (exit 1); exit 1; }; } | |
| - # Do quote $f, to prevent DOS paths from being IFS'd. | |
| - echo "$f";; | |
| - *) # Relative | |
| - if test -f "$f"; then | |
| - # Build tree | |
| - echo "$f" | |
| - elif test -f "$srcdir/$f"; then | |
| - # Source tree | |
| - echo "$srcdir/$f" | |
| - else | |
| - # /dev/null tree | |
| - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 | |
| -echo "$as_me: error: cannot find input file: $f" >&2;} | |
| - { (exit 1); exit 1; }; } | |
| - fi;; | |
| - esac | |
| - done` || { (exit 1); exit 1; } | |
| - # Remove the trailing spaces. | |
| - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in | |
| - | |
| + ;; | |
| + :H) | |
| + # | |
| + # CONFIG_HEADER | |
| + # | |
| _ACEOF | |
| -# Transform confdefs.h into two sed scripts, `conftest.defines' and | |
| -# `conftest.undefs', that substitutes the proper values into | |
| -# config.h.in to produce config.h. The first handles `#define' | |
| -# templates, and the second `#undef' templates. | |
| -# And first: Protect against being on the right side of a sed subst in | |
| -# config.status. Protect against being in an unquoted here document | |
| -# in config.status. | |
| -rm -f conftest.defines conftest.undefs | |
| -# Using a here document instead of a string reduces the quoting nightmare. | |
| -# Putting comments in sed scripts is not portable. | |
| -# | |
| -# `end' is used to avoid that the second main sed command (meant for | |
| -# 0-ary CPP macros) applies to n-ary macro definitions. | |
| -# See the Autoconf documentation for `clear'. | |
| -cat >confdef2sed.sed <<\_ACEOF | |
| -s/[\\&,]/\\&/g | |
| -s,[\\$`],\\&,g | |
| -t clear | |
| -: clear | |
| -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp | |
| -t end | |
| -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp | |
| -: end | |
| -_ACEOF | |
| -# If some macros were called several times there might be several times | |
| -# the same #defines, which is useless. Nevertheless, we may not want to | |
| -# sort them, since we want the *last* AC-DEFINE to be honored. | |
| -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines | |
| -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs | |
| -rm -f confdef2sed.sed | |
| +# Transform confdefs.h into a sed script `conftest.defines', that | |
| +# substitutes the proper values into config.h.in to produce config.h. | |
| +rm -f conftest.defines conftest.tail | |
| +# First, append a space to every undef/define line, to ease matching. | |
| +echo 's/$/ /' >conftest.defines | |
| +# Then, protect against being on the right side of a sed subst, or in | |
| +# an unquoted here document, in config.status. If some macros were | |
| +# called several times there might be several #defines for the same | |
| +# symbol, which is useless. But do not sort them, since the last | |
| +# AC_DEFINE must be honored. | |
| +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* | |
| +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where | |
| +# NAME is the cpp macro being defined, VALUE is the value it is being given. | |
| +# PARAMS is the parameter list in the macro definition--in most cases, it's | |
| +# just an empty string. | |
| +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' | |
| +ac_dB='\\)[ (].*,\\1define\\2' | |
| +ac_dC=' ' | |
| +ac_dD=' ,' | |
| + | |
| +uniq confdefs.h | | |
| + sed -n ' | |
| + t rset | |
| + :rset | |
| + s/^[ ]*#[ ]*define[ ][ ]*// | |
| + t ok | |
| + d | |
| + :ok | |
| + s/[\\&,]/\\&/g | |
| + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p | |
| + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p | |
| + ' >>conftest.defines | |
| -# This sed command replaces #undef with comments. This is necessary, for | |
| +# Remove the space that was appended to ease matching. | |
| +# Then replace #undef with comments. This is necessary, for | |
| # example, in the case of _POSIX_SOURCE, which is predefined and required | |
| # on some systems where configure will not decide to define it. | |
| -cat >>conftest.undefs <<\_ACEOF | |
| -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, | |
| -_ACEOF | |
| +# (The regexp can be short, since the line contains either #define or #undef.) | |
| +echo 's/ $// | |
| +s,^[ #]*u.*,/* & */,' >>conftest.defines | |
| + | |
| +# Break up conftest.defines: | |
| +ac_max_sed_lines=50 | |
| + | |
| +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" | |
| +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" | |
| +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" | |
| +# et cetera. | |
| +ac_in='$ac_file_inputs' | |
| +ac_out='"$tmp/out1"' | |
| +ac_nxt='"$tmp/out2"' | |
| -# Break up conftest.defines because some shells have a limit on the size | |
| -# of here documents, and old seds have small limits too (100 cmds). | |
| -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS | |
| -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS | |
| -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS | |
| -echo ' :' >>$CONFIG_STATUS | |
| -rm -f conftest.tail | |
| -while grep . conftest.defines >/dev/null | |
| +while : | |
| do | |
| - # Write a limited-size here document to $tmp/defines.sed. | |
| - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS | |
| - # Speed up: don't consider the non `#define' lines. | |
| - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS | |
| - # Work around the forget-to-reset-the-flag bug. | |
| - echo 't clr' >>$CONFIG_STATUS | |
| - echo ': clr' >>$CONFIG_STATUS | |
| - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS | |
| + # Write a here document: | |
| + cat >>$CONFIG_STATUS <<_ACEOF | |
| + # First, check the format of the line: | |
| + cat >"\$tmp/defines.sed" <<\\CEOF | |
| +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def | |
| +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def | |
| +b | |
| +:def | |
| +_ACEOF | |
| + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS | |
| echo 'CEOF | |
| - sed -f $tmp/defines.sed $tmp/in >$tmp/out | |
| - rm -f $tmp/in | |
| - mv $tmp/out $tmp/in | |
| -' >>$CONFIG_STATUS | |
| - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail | |
| + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS | |
| + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in | |
| + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail | |
| + grep . conftest.tail >/dev/null || break | |
| rm -f conftest.defines | |
| mv conftest.tail conftest.defines | |
| done | |
| -rm -f conftest.defines | |
| -echo ' fi # grep' >>$CONFIG_STATUS | |
| -echo >>$CONFIG_STATUS | |
| - | |
| -# Break up conftest.undefs because some shells have a limit on the size | |
| -# of here documents, and old seds have small limits too (100 cmds). | |
| -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS | |
| -rm -f conftest.tail | |
| -while grep . conftest.undefs >/dev/null | |
| -do | |
| - # Write a limited-size here document to $tmp/undefs.sed. | |
| - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS | |
| - # Speed up: don't consider the non `#undef' | |
| - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS | |
| - # Work around the forget-to-reset-the-flag bug. | |
| - echo 't clr' >>$CONFIG_STATUS | |
| - echo ': clr' >>$CONFIG_STATUS | |
| - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS | |
| - echo 'CEOF | |
| - sed -f $tmp/undefs.sed $tmp/in >$tmp/out | |
| - rm -f $tmp/in | |
| - mv $tmp/out $tmp/in | |
| -' >>$CONFIG_STATUS | |
| - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail | |
| - rm -f conftest.undefs | |
| - mv conftest.tail conftest.undefs | |
| -done | |
| -rm -f conftest.undefs | |
| +rm -f conftest.defines conftest.tail | |
| +echo "ac_result=$ac_in" >>$CONFIG_STATUS | |
| cat >>$CONFIG_STATUS <<\_ACEOF | |
| - # Let's still pretend it is `configure' which instantiates (i.e., don't | |
| - # use $as_me), people would be surprised to read: | |
| - # /* config.h. Generated by config.status. */ | |
| - if test x"$ac_file" = x-; then | |
| - echo "/* Generated by configure. */" >$tmp/config.h | |
| - else | |
| - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h | |
| - fi | |
| - cat $tmp/in >>$tmp/config.h | |
| - rm -f $tmp/in | |
| if test x"$ac_file" != x-; then | |
| - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then | |
| + echo "/* $configure_input */" >"$tmp/config.h" | |
| + cat "$ac_result" >>"$tmp/config.h" | |
| + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then | |
| { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 | |
| echo "$as_me: $ac_file is unchanged" >&6;} | |
| else | |
| - ac_dir=`(dirname "$ac_file") 2>/dev/null || | |
| -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| - X"$ac_file" : 'X\(//\)[^/]' \| \ | |
| - X"$ac_file" : 'X\(//\)$' \| \ | |
| - X"$ac_file" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| -echo X"$ac_file" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| - { if $as_mkdir_p; then | |
| - mkdir -p "$ac_dir" | |
| - else | |
| - as_dir="$ac_dir" | |
| - as_dirs= | |
| - while test ! -d "$as_dir"; do | |
| - as_dirs="$as_dir $as_dirs" | |
| - as_dir=`(dirname "$as_dir") 2>/dev/null || | |
| -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| - X"$as_dir" : 'X\(//\)[^/]' \| \ | |
| - X"$as_dir" : 'X\(//\)$' \| \ | |
| - X"$as_dir" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| -echo X"$as_dir" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| - done | |
| - test ! -n "$as_dirs" || mkdir $as_dirs | |
| - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | |
| -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | |
| - { (exit 1); exit 1; }; }; } | |
| - | |
| rm -f $ac_file | |
| - mv $tmp/config.h $ac_file | |
| + mv "$tmp/config.h" $ac_file | |
| fi | |
| else | |
| - cat $tmp/config.h | |
| - rm -f $tmp/config.h | |
| + echo "/* $configure_input */" | |
| + cat "$ac_result" | |
| fi | |
| + rm -f "$tmp/out12" | |
| # Compute $ac_file's index in $config_headers. | |
| +_am_arg=$ac_file | |
| _am_stamp_count=1 | |
| for _am_header in $config_headers :; do | |
| case $_am_header in | |
| - $ac_file | $ac_file:* ) | |
| + $_am_arg | $_am_arg:* ) | |
| break ;; | |
| * ) | |
| _am_stamp_count=`expr $_am_stamp_count + 1` ;; | |
| esac | |
| done | |
| -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || | |
| -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| - X$ac_file : 'X\(//\)[^/]' \| \ | |
| - X$ac_file : 'X\(//\)$' \| \ | |
| - X$ac_file : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| -echo X$ac_file | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'`/stamp-h$_am_stamp_count | |
| -done | |
| -_ACEOF | |
| -cat >>$CONFIG_STATUS <<\_ACEOF | |
| - | |
| -# | |
| -# CONFIG_COMMANDS section. | |
| -# | |
| -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue | |
| - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` | |
| - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` | |
| - ac_dir=`(dirname "$ac_dest") 2>/dev/null || | |
| -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| - X"$ac_dest" : 'X\(//\)[^/]' \| \ | |
| - X"$ac_dest" : 'X\(//\)$' \| \ | |
| - X"$ac_dest" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| -echo X"$ac_dest" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| - { if $as_mkdir_p; then | |
| - mkdir -p "$ac_dir" | |
| - else | |
| - as_dir="$ac_dir" | |
| - as_dirs= | |
| - while test ! -d "$as_dir"; do | |
| - as_dirs="$as_dir $as_dirs" | |
| - as_dir=`(dirname "$as_dir") 2>/dev/null || | |
| -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| - X"$as_dir" : 'X\(//\)[^/]' \| \ | |
| - X"$as_dir" : 'X\(//\)$' \| \ | |
| - X"$as_dir" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| -echo X"$as_dir" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| - done | |
| - test ! -n "$as_dirs" || mkdir $as_dirs | |
| - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 | |
| -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} | |
| - { (exit 1); exit 1; }; }; } | |
| - | |
| - ac_builddir=. | |
| - | |
| -if test "$ac_dir" != .; then | |
| - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` | |
| - # A "../" for each directory in $ac_dir_suffix. | |
| - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` | |
| -else | |
| - ac_dir_suffix= ac_top_builddir= | |
| -fi | |
| - | |
| -case $srcdir in | |
| - .) # No --srcdir option. We are building in place. | |
| - ac_srcdir=. | |
| - if test -z "$ac_top_builddir"; then | |
| - ac_top_srcdir=. | |
| - else | |
| - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` | |
| - fi ;; | |
| - [\\/]* | ?:[\\/]* ) # Absolute path. | |
| - ac_srcdir=$srcdir$ac_dir_suffix; | |
| - ac_top_srcdir=$srcdir ;; | |
| - *) # Relative path. | |
| - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix | |
| - ac_top_srcdir=$ac_top_builddir$srcdir ;; | |
| -esac | |
| +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || | |
| +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| + X"$_am_arg" : 'X\(//\)[^/]' \| \ | |
| + X"$_am_arg" : 'X\(//\)$' \| \ | |
| + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || | |
| +echo X"$_am_arg" | | |
| + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)[^/].*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'`/stamp-h$_am_stamp_count | |
| + ;; | |
| -# Do not use `cd foo && pwd` to compute absolute paths, because | |
| -# the directories may not exist. | |
| -case `pwd` in | |
| -.) ac_abs_builddir="$ac_dir";; | |
| -*) | |
| - case "$ac_dir" in | |
| - .) ac_abs_builddir=`pwd`;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; | |
| - *) ac_abs_builddir=`pwd`/"$ac_dir";; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_top_builddir=${ac_top_builddir}.;; | |
| -*) | |
| - case ${ac_top_builddir}. in | |
| - .) ac_abs_top_builddir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; | |
| - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_srcdir=$ac_srcdir;; | |
| -*) | |
| - case $ac_srcdir in | |
| - .) ac_abs_srcdir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; | |
| - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; | |
| - esac;; | |
| -esac | |
| -case $ac_abs_builddir in | |
| -.) ac_abs_top_srcdir=$ac_top_srcdir;; | |
| -*) | |
| - case $ac_top_srcdir in | |
| - .) ac_abs_top_srcdir=$ac_abs_builddir;; | |
| - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; | |
| - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; | |
| - esac;; | |
| -esac | |
| + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 | |
| +echo "$as_me: executing $ac_file commands" >&6;} | |
| + ;; | |
| + esac | |
| - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 | |
| -echo "$as_me: executing $ac_dest commands" >&6;} | |
| - case $ac_dest in | |
| - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do | |
| + case $ac_file$ac_mode in | |
| + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do | |
| # Strip MF so we end up with the name of the file. | |
| mf=`echo "$mf" | sed -e 's/:.*$//'` | |
| # Check whether this is an Automake generated Makefile or not. | |
| @@ -22647,20 +23644,32 @@ | |
| # some people rename them; so instead we look at the file content. | |
| # Grep'ing the first line is not enough: some people post-process | |
| # each Makefile.in and add a new line on top of each file to say so. | |
| - # So let's grep whole file. | |
| - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then | |
| - dirpart=`(dirname "$mf") 2>/dev/null || | |
| + # Grep'ing the whole file is not good either: AIX grep has a line | |
| + # limit of 2048, but all sed's we know have understand at least 4000. | |
| + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then | |
| + dirpart=`$as_dirname -- "$mf" || | |
| $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| X"$mf" : 'X\(//\)[^/]' \| \ | |
| X"$mf" : 'X\(//\)$' \| \ | |
| - X"$mf" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$mf" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X"$mf" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)[^/].*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| else | |
| continue | |
| fi | |
| @@ -22682,53 +23691,79 @@ | |
| sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do | |
| # Make sure the directory exists. | |
| test -f "$dirpart/$file" && continue | |
| - fdir=`(dirname "$file") 2>/dev/null || | |
| + fdir=`$as_dirname -- "$file" || | |
| $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| X"$file" : 'X\(//\)[^/]' \| \ | |
| X"$file" : 'X\(//\)$' \| \ | |
| - X"$file" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$file" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X"$file" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| - { if $as_mkdir_p; then | |
| - mkdir -p $dirpart/$fdir | |
| - else | |
| - as_dir=$dirpart/$fdir | |
| + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)[^/].*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| + { as_dir=$dirpart/$fdir | |
| + case $as_dir in #( | |
| + -*) as_dir=./$as_dir;; | |
| + esac | |
| + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { | |
| as_dirs= | |
| - while test ! -d "$as_dir"; do | |
| - as_dirs="$as_dir $as_dirs" | |
| - as_dir=`(dirname "$as_dir") 2>/dev/null || | |
| + while :; do | |
| + case $as_dir in #( | |
| + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( | |
| + *) as_qdir=$as_dir;; | |
| + esac | |
| + as_dirs="'$as_qdir' $as_dirs" | |
| + as_dir=`$as_dirname -- "$as_dir" || | |
| $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | |
| X"$as_dir" : 'X\(//\)[^/]' \| \ | |
| X"$as_dir" : 'X\(//\)$' \| \ | |
| - X"$as_dir" : 'X\(/\)' \| \ | |
| - . : '\(.\)' 2>/dev/null || | |
| + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || | |
| echo X"$as_dir" | | |
| - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } | |
| - /^X\(\/\/\)[^/].*/{ s//\1/; q; } | |
| - /^X\(\/\/\)$/{ s//\1/; q; } | |
| - /^X\(\/\).*/{ s//\1/; q; } | |
| - s/.*/./; q'` | |
| + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)[^/].*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\/\)$/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + /^X\(\/\).*/{ | |
| + s//\1/ | |
| + q | |
| + } | |
| + s/.*/./; q'` | |
| + test -d "$as_dir" && break | |
| done | |
| - test ! -n "$as_dirs" || mkdir $as_dirs | |
| - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 | |
| -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} | |
| + test -z "$as_dirs" || eval "mkdir $as_dirs" | |
| + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 | |
| +echo "$as_me: error: cannot create directory $as_dir" >&2;} | |
| { (exit 1); exit 1; }; }; } | |
| - | |
| # echo "creating $dirpart/$file" | |
| echo '# dummy' > "$dirpart/$file" | |
| done | |
| done | |
| ;; | |
| + | |
| esac | |
| -done | |
| -_ACEOF | |
| +done # for ac_tag | |
| -cat >>$CONFIG_STATUS <<\_ACEOF | |
| { (exit 0); exit 0; } | |
| _ACEOF | |
| diff -aruN sysfsutils-2.1.0/lib/Makefile.in sysfsutils-2.1.0.N/lib/Makefile.in | |
| --- sysfsutils-2.1.0/lib/Makefile.in 2006-08-23 01:38:57.000000000 -0700 | |
| +++ sysfsutils-2.1.0.N/lib/Makefile.in 2008-12-09 13:18:07.000000000 -0800 | |
| @@ -1,8 +1,8 @@ | |
| -# Makefile.in generated by automake 1.9.6 from Makefile.am. | |
| +# Makefile.in generated by automake 1.10.1 from Makefile.am. | |
| # @configure_input@ | |
| # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| -# 2003, 2004, 2005 Free Software Foundation, Inc. | |
| +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
| # This Makefile.in is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -14,15 +14,11 @@ | |
| @SET_MAKE@ | |
| -srcdir = @srcdir@ | |
| -top_srcdir = @top_srcdir@ | |
| VPATH = @srcdir@ | |
| pkgdatadir = $(datadir)/@PACKAGE@ | |
| pkglibdir = $(libdir)/@PACKAGE@ | |
| pkgincludedir = $(includedir)/@PACKAGE@ | |
| -top_builddir = .. | |
| am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | |
| -INSTALL = @INSTALL@ | |
| install_sh_DATA = $(install_sh) -c -m 644 | |
| install_sh_PROGRAM = $(install_sh) -c | |
| install_sh_SCRIPT = $(install_sh) -c | |
| @@ -62,25 +58,27 @@ | |
| libsysfs_la-sysfs_driver.lo libsysfs_la-sysfs_bus.lo \ | |
| libsysfs_la-sysfs_module.lo | |
| libsysfs_la_OBJECTS = $(am_libsysfs_la_OBJECTS) | |
| -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | |
| +libsysfs_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | |
| + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsysfs_la_CFLAGS) \ | |
| + $(CFLAGS) $(libsysfs_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | |
| depcomp = $(SHELL) $(top_srcdir)/depcomp | |
| am__depfiles_maybe = depfiles | |
| COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | |
| $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ | |
| - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| - $(AM_CFLAGS) $(CFLAGS) | |
| +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | |
| + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | |
| + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| CCLD = $(CC) | |
| -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | |
| - $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | |
| + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | |
| + $(LDFLAGS) -o $@ | |
| SOURCES = $(libsysfs_la_SOURCES) | |
| DIST_SOURCES = $(libsysfs_la_SOURCES) | |
| ETAGS = etags | |
| CTAGS = ctags | |
| DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| ACLOCAL = @ACLOCAL@ | |
| -AMDEP_FALSE = @AMDEP_FALSE@ | |
| -AMDEP_TRUE = @AMDEP_TRUE@ | |
| AMTAR = @AMTAR@ | |
| AR = @AR@ | |
| AUTOCONF = @AUTOCONF@ | |
| @@ -99,6 +97,7 @@ | |
| CYGPATH_W = @CYGPATH_W@ | |
| DEFS = @DEFS@ | |
| DEPDIR = @DEPDIR@ | |
| +DSYMUTIL = @DSYMUTIL@ | |
| ECHO = @ECHO@ | |
| ECHO_C = @ECHO_C@ | |
| ECHO_N = @ECHO_N@ | |
| @@ -108,14 +107,14 @@ | |
| EXTRA_CFLAGS = @EXTRA_CLFAGS@ | |
| F77 = @F77@ | |
| FFLAGS = @FFLAGS@ | |
| +GREP = @GREP@ | |
| +INSTALL = @INSTALL@ | |
| INSTALL_DATA = @INSTALL_DATA@ | |
| INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | |
| KLCC = @KLCC@ | |
| KLIBC = @KLIBC@ | |
| -KLIBC_FALSE = @KLIBC_FALSE@ | |
| -KLIBC_TRUE = @KLIBC_TRUE@ | |
| LDFLAGS = @LDFLAGS@ | |
| LIBOBJS = @LIBOBJS@ | |
| LIBS = @LIBS@ | |
| @@ -123,6 +122,8 @@ | |
| LN_S = @LN_S@ | |
| LTLIBOBJS = @LTLIBOBJS@ | |
| MAKEINFO = @MAKEINFO@ | |
| +MKDIR_P = @MKDIR_P@ | |
| +NMEDIT = @NMEDIT@ | |
| OBJEXT = @OBJEXT@ | |
| PACKAGE = @PACKAGE@ | |
| PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |
| @@ -132,20 +133,18 @@ | |
| PACKAGE_VERSION = @PACKAGE_VERSION@ | |
| PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| RANLIB = @RANLIB@ | |
| +SED = @SED@ | |
| SET_MAKE = @SET_MAKE@ | |
| SHELL = @SHELL@ | |
| STRIP = @STRIP@ | |
| VERSION = @VERSION@ | |
| -ac_ct_AR = @ac_ct_AR@ | |
| +abs_builddir = @abs_builddir@ | |
| +abs_srcdir = @abs_srcdir@ | |
| +abs_top_builddir = @abs_top_builddir@ | |
| +abs_top_srcdir = @abs_top_srcdir@ | |
| ac_ct_CC = @ac_ct_CC@ | |
| ac_ct_CXX = @ac_ct_CXX@ | |
| ac_ct_F77 = @ac_ct_F77@ | |
| -ac_ct_RANLIB = @ac_ct_RANLIB@ | |
| -ac_ct_STRIP = @ac_ct_STRIP@ | |
| -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ | |
| -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ | |
| -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ | |
| -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ | |
| am__include = @am__include@ | |
| am__leading_dot = @am__leading_dot@ | |
| am__quote = @am__quote@ | |
| @@ -157,33 +156,44 @@ | |
| build_cpu = @build_cpu@ | |
| build_os = @build_os@ | |
| build_vendor = @build_vendor@ | |
| +builddir = @builddir@ | |
| datadir = @datadir@ | |
| +datarootdir = @datarootdir@ | |
| +docdir = @docdir@ | |
| +dvidir = @dvidir@ | |
| exec_prefix = @exec_prefix@ | |
| host = @host@ | |
| host_alias = @host_alias@ | |
| host_cpu = @host_cpu@ | |
| host_os = @host_os@ | |
| host_vendor = @host_vendor@ | |
| +htmldir = @htmldir@ | |
| includedir = @includedir@ | |
| infodir = @infodir@ | |
| install_sh = @install_sh@ | |
| libdir = @libdir@ | |
| libexecdir = @libexecdir@ | |
| +localedir = @localedir@ | |
| localstatedir = @localstatedir@ | |
| mandir = @mandir@ | |
| mkdir_p = @mkdir_p@ | |
| oldincludedir = @oldincludedir@ | |
| +pdfdir = @pdfdir@ | |
| prefix = @prefix@ | |
| program_transform_name = @program_transform_name@ | |
| +psdir = @psdir@ | |
| sbindir = @sbindir@ | |
| sharedstatedir = @sharedstatedir@ | |
| +srcdir = @srcdir@ | |
| sysconfdir = @sysconfdir@ | |
| target_alias = @target_alias@ | |
| +top_builddir = @top_builddir@ | |
| +top_srcdir = @top_srcdir@ | |
| lib_LTLIBRARIES = libsysfs.la | |
| libsysfs_la_SOURCES = sysfs_utils.c sysfs_attr.c sysfs_class.c dlist.c \ | |
| sysfs_device.c sysfs_driver.c sysfs_bus.c sysfs_module.c sysfs.h | |
| -INCLUDES = -I../include | |
| +INCLUDES = -I$(top_srcdir)/include | |
| libsysfs_la_LDFLAGS = -version-info 2:1:0 | |
| libsysfs_la_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS) | |
| all: all-am | |
| @@ -221,21 +231,21 @@ | |
| cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| install-libLTLIBRARIES: $(lib_LTLIBRARIES) | |
| @$(NORMAL_INSTALL) | |
| - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" | |
| + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" | |
| @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | |
| if test -f $$p; then \ | |
| f=$(am__strip_dir) \ | |
| - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ | |
| - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ | |
| + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ | |
| + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ | |
| else :; fi; \ | |
| done | |
| uninstall-libLTLIBRARIES: | |
| @$(NORMAL_UNINSTALL) | |
| - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | |
| + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ | |
| p=$(am__strip_dir) \ | |
| - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ | |
| - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ | |
| + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ | |
| + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ | |
| done | |
| clean-libLTLIBRARIES: | |
| @@ -247,7 +257,7 @@ | |
| rm -f "$${dir}/so_locations"; \ | |
| done | |
| libsysfs.la: $(libsysfs_la_OBJECTS) $(libsysfs_la_DEPENDENCIES) | |
| - $(LINK) -rpath $(libdir) $(libsysfs_la_LDFLAGS) $(libsysfs_la_OBJECTS) $(libsysfs_la_LIBADD) $(LIBS) | |
| + $(libsysfs_la_LINK) -rpath $(libdir) $(libsysfs_la_OBJECTS) $(libsysfs_la_LIBADD) $(LIBS) | |
| mostlyclean-compile: | |
| -rm -f *.$(OBJEXT) | |
| @@ -265,81 +275,81 @@ | |
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsysfs_la-sysfs_utils.Plo@am__quote@ | |
| .c.o: | |
| -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(COMPILE) -c $< | |
| .c.obj: | |
| -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | |
| .c.lo: | |
| -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | |
| libsysfs_la-sysfs_utils.lo: sysfs_utils.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_utils.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-sysfs_utils.Tpo" -c -o libsysfs_la-sysfs_utils.lo `test -f 'sysfs_utils.c' || echo '$(srcdir)/'`sysfs_utils.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-sysfs_utils.Tpo" "$(DEPDIR)/libsysfs_la-sysfs_utils.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-sysfs_utils.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_utils.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-sysfs_utils.Tpo -c -o libsysfs_la-sysfs_utils.lo `test -f 'sysfs_utils.c' || echo '$(srcdir)/'`sysfs_utils.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-sysfs_utils.Tpo $(DEPDIR)/libsysfs_la-sysfs_utils.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sysfs_utils.c' object='libsysfs_la-sysfs_utils.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_utils.lo `test -f 'sysfs_utils.c' || echo '$(srcdir)/'`sysfs_utils.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_utils.lo `test -f 'sysfs_utils.c' || echo '$(srcdir)/'`sysfs_utils.c | |
| libsysfs_la-sysfs_attr.lo: sysfs_attr.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_attr.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-sysfs_attr.Tpo" -c -o libsysfs_la-sysfs_attr.lo `test -f 'sysfs_attr.c' || echo '$(srcdir)/'`sysfs_attr.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-sysfs_attr.Tpo" "$(DEPDIR)/libsysfs_la-sysfs_attr.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-sysfs_attr.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_attr.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-sysfs_attr.Tpo -c -o libsysfs_la-sysfs_attr.lo `test -f 'sysfs_attr.c' || echo '$(srcdir)/'`sysfs_attr.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-sysfs_attr.Tpo $(DEPDIR)/libsysfs_la-sysfs_attr.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sysfs_attr.c' object='libsysfs_la-sysfs_attr.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_attr.lo `test -f 'sysfs_attr.c' || echo '$(srcdir)/'`sysfs_attr.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_attr.lo `test -f 'sysfs_attr.c' || echo '$(srcdir)/'`sysfs_attr.c | |
| libsysfs_la-sysfs_class.lo: sysfs_class.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_class.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-sysfs_class.Tpo" -c -o libsysfs_la-sysfs_class.lo `test -f 'sysfs_class.c' || echo '$(srcdir)/'`sysfs_class.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-sysfs_class.Tpo" "$(DEPDIR)/libsysfs_la-sysfs_class.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-sysfs_class.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_class.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-sysfs_class.Tpo -c -o libsysfs_la-sysfs_class.lo `test -f 'sysfs_class.c' || echo '$(srcdir)/'`sysfs_class.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-sysfs_class.Tpo $(DEPDIR)/libsysfs_la-sysfs_class.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sysfs_class.c' object='libsysfs_la-sysfs_class.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_class.lo `test -f 'sysfs_class.c' || echo '$(srcdir)/'`sysfs_class.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_class.lo `test -f 'sysfs_class.c' || echo '$(srcdir)/'`sysfs_class.c | |
| libsysfs_la-dlist.lo: dlist.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-dlist.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-dlist.Tpo" -c -o libsysfs_la-dlist.lo `test -f 'dlist.c' || echo '$(srcdir)/'`dlist.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-dlist.Tpo" "$(DEPDIR)/libsysfs_la-dlist.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-dlist.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-dlist.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-dlist.Tpo -c -o libsysfs_la-dlist.lo `test -f 'dlist.c' || echo '$(srcdir)/'`dlist.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-dlist.Tpo $(DEPDIR)/libsysfs_la-dlist.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dlist.c' object='libsysfs_la-dlist.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-dlist.lo `test -f 'dlist.c' || echo '$(srcdir)/'`dlist.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-dlist.lo `test -f 'dlist.c' || echo '$(srcdir)/'`dlist.c | |
| libsysfs_la-sysfs_device.lo: sysfs_device.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_device.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-sysfs_device.Tpo" -c -o libsysfs_la-sysfs_device.lo `test -f 'sysfs_device.c' || echo '$(srcdir)/'`sysfs_device.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-sysfs_device.Tpo" "$(DEPDIR)/libsysfs_la-sysfs_device.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-sysfs_device.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_device.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-sysfs_device.Tpo -c -o libsysfs_la-sysfs_device.lo `test -f 'sysfs_device.c' || echo '$(srcdir)/'`sysfs_device.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-sysfs_device.Tpo $(DEPDIR)/libsysfs_la-sysfs_device.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sysfs_device.c' object='libsysfs_la-sysfs_device.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_device.lo `test -f 'sysfs_device.c' || echo '$(srcdir)/'`sysfs_device.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_device.lo `test -f 'sysfs_device.c' || echo '$(srcdir)/'`sysfs_device.c | |
| libsysfs_la-sysfs_driver.lo: sysfs_driver.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_driver.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-sysfs_driver.Tpo" -c -o libsysfs_la-sysfs_driver.lo `test -f 'sysfs_driver.c' || echo '$(srcdir)/'`sysfs_driver.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-sysfs_driver.Tpo" "$(DEPDIR)/libsysfs_la-sysfs_driver.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-sysfs_driver.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_driver.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-sysfs_driver.Tpo -c -o libsysfs_la-sysfs_driver.lo `test -f 'sysfs_driver.c' || echo '$(srcdir)/'`sysfs_driver.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-sysfs_driver.Tpo $(DEPDIR)/libsysfs_la-sysfs_driver.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sysfs_driver.c' object='libsysfs_la-sysfs_driver.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_driver.lo `test -f 'sysfs_driver.c' || echo '$(srcdir)/'`sysfs_driver.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_driver.lo `test -f 'sysfs_driver.c' || echo '$(srcdir)/'`sysfs_driver.c | |
| libsysfs_la-sysfs_bus.lo: sysfs_bus.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_bus.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-sysfs_bus.Tpo" -c -o libsysfs_la-sysfs_bus.lo `test -f 'sysfs_bus.c' || echo '$(srcdir)/'`sysfs_bus.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-sysfs_bus.Tpo" "$(DEPDIR)/libsysfs_la-sysfs_bus.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-sysfs_bus.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_bus.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-sysfs_bus.Tpo -c -o libsysfs_la-sysfs_bus.lo `test -f 'sysfs_bus.c' || echo '$(srcdir)/'`sysfs_bus.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-sysfs_bus.Tpo $(DEPDIR)/libsysfs_la-sysfs_bus.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sysfs_bus.c' object='libsysfs_la-sysfs_bus.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_bus.lo `test -f 'sysfs_bus.c' || echo '$(srcdir)/'`sysfs_bus.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_bus.lo `test -f 'sysfs_bus.c' || echo '$(srcdir)/'`sysfs_bus.c | |
| libsysfs_la-sysfs_module.lo: sysfs_module.c | |
| -@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_module.lo -MD -MP -MF "$(DEPDIR)/libsysfs_la-sysfs_module.Tpo" -c -o libsysfs_la-sysfs_module.lo `test -f 'sysfs_module.c' || echo '$(srcdir)/'`sysfs_module.c; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libsysfs_la-sysfs_module.Tpo" "$(DEPDIR)/libsysfs_la-sysfs_module.Plo"; else rm -f "$(DEPDIR)/libsysfs_la-sysfs_module.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -MT libsysfs_la-sysfs_module.lo -MD -MP -MF $(DEPDIR)/libsysfs_la-sysfs_module.Tpo -c -o libsysfs_la-sysfs_module.lo `test -f 'sysfs_module.c' || echo '$(srcdir)/'`sysfs_module.c | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libsysfs_la-sysfs_module.Tpo $(DEPDIR)/libsysfs_la-sysfs_module.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sysfs_module.c' object='libsysfs_la-sysfs_module.lo' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_module.lo `test -f 'sysfs_module.c' || echo '$(srcdir)/'`sysfs_module.c | |
| +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsysfs_la_CFLAGS) $(CFLAGS) -c -o libsysfs_la-sysfs_module.lo `test -f 'sysfs_module.c' || echo '$(srcdir)/'`sysfs_module.c | |
| mostlyclean-libtool: | |
| -rm -f *.lo | |
| @@ -347,17 +357,13 @@ | |
| clean-libtool: | |
| -rm -rf .libs _libs | |
| -distclean-libtool: | |
| - -rm -f libtool | |
| -uninstall-info-am: | |
| - | |
| ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | |
| list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| mkid -fID $$unique | |
| tags: TAGS | |
| @@ -369,8 +375,8 @@ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | |
| test -n "$$unique" || unique=$$empty_fix; \ | |
| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| @@ -380,13 +386,12 @@ | |
| CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | |
| $(TAGS_FILES) $(LISP) | |
| tags=; \ | |
| - here=`pwd`; \ | |
| list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| test -z "$(CTAGS_ARGS)$$tags$$unique" \ | |
| || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | |
| $$tags $$unique | |
| @@ -400,22 +405,21 @@ | |
| -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | |
| distdir: $(DISTFILES) | |
| - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ | |
| - list='$(DISTFILES)'; for file in $$list; do \ | |
| - case $$file in \ | |
| - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ | |
| - esac; \ | |
| + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + list='$(DISTFILES)'; \ | |
| + dist_files=`for file in $$list; do echo $$file; done | \ | |
| + sed -e "s|^$$srcdirstrip/||;t" \ | |
| + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | |
| + case $$dist_files in \ | |
| + */*) $(MKDIR_P) `echo "$$dist_files" | \ | |
| + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | |
| + sort -u` ;; \ | |
| + esac; \ | |
| + for file in $$dist_files; do \ | |
| if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | |
| - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ | |
| - dir="/$$dir"; \ | |
| - $(mkdir_p) "$(distdir)$$dir"; \ | |
| - else \ | |
| - dir=''; \ | |
| - fi; \ | |
| if test -d $$d/$$file; then \ | |
| + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | |
| cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | |
| fi; \ | |
| @@ -431,7 +435,7 @@ | |
| all-am: Makefile $(LTLIBRARIES) | |
| installdirs: | |
| for dir in "$(DESTDIR)$(libdir)"; do \ | |
| - test -z "$$dir" || $(mkdir_p) "$$dir"; \ | |
| + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | |
| done | |
| install: install-am | |
| install-exec: install-exec-am | |
| @@ -466,7 +470,7 @@ | |
| -rm -rf ./$(DEPDIR) | |
| -rm -f Makefile | |
| distclean-am: clean-am distclean-compile distclean-generic \ | |
| - distclean-libtool distclean-tags | |
| + distclean-tags | |
| dvi: dvi-am | |
| @@ -480,12 +484,20 @@ | |
| install-data-am: | |
| +install-dvi: install-dvi-am | |
| + | |
| install-exec-am: install-libLTLIBRARIES | |
| +install-html: install-html-am | |
| + | |
| install-info: install-info-am | |
| install-man: | |
| +install-pdf: install-pdf-am | |
| + | |
| +install-ps: install-ps-am | |
| + | |
| installcheck-am: | |
| maintainer-clean: maintainer-clean-am | |
| @@ -506,20 +518,23 @@ | |
| ps-am: | |
| -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES | |
| +uninstall-am: uninstall-libLTLIBRARIES | |
| + | |
| +.MAKE: install-am install-strip | |
| .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | |
| clean-libLTLIBRARIES clean-libtool ctags distclean \ | |
| distclean-compile distclean-generic distclean-libtool \ | |
| distclean-tags distdir dvi dvi-am html html-am info info-am \ | |
| - install install-am install-data install-data-am install-exec \ | |
| - install-exec-am install-info install-info-am \ | |
| - install-libLTLIBRARIES install-man install-strip installcheck \ | |
| + install install-am install-data install-data-am install-dvi \ | |
| + install-dvi-am install-exec install-exec-am install-html \ | |
| + install-html-am install-info install-info-am \ | |
| + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ | |
| + install-ps install-ps-am install-strip installcheck \ | |
| installcheck-am installdirs maintainer-clean \ | |
| maintainer-clean-generic mostlyclean mostlyclean-compile \ | |
| mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | |
| - tags uninstall uninstall-am uninstall-info-am \ | |
| - uninstall-libLTLIBRARIES | |
| + tags uninstall uninstall-am uninstall-libLTLIBRARIES | |
| # Tell versions [3.59,3.63) of GNU make to not export all variables. | |
| # Otherwise a system limit (for SysV at least) may be exceeded. | |
| diff -aruN sysfsutils-2.1.0/Makefile.in sysfsutils-2.1.0.N/Makefile.in | |
| --- sysfsutils-2.1.0/Makefile.in 2006-08-23 01:38:57.000000000 -0700 | |
| +++ sysfsutils-2.1.0.N/Makefile.in 2008-12-09 13:18:07.000000000 -0800 | |
| @@ -1,8 +1,8 @@ | |
| -# Makefile.in generated by automake 1.9.6 from Makefile.am. | |
| +# Makefile.in generated by automake 1.10.1 from Makefile.am. | |
| # @configure_input@ | |
| # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| -# 2003, 2004, 2005 Free Software Foundation, Inc. | |
| +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
| # This Makefile.in is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -14,15 +14,11 @@ | |
| @SET_MAKE@ | |
| -srcdir = @srcdir@ | |
| -top_srcdir = @top_srcdir@ | |
| VPATH = @srcdir@ | |
| pkgdatadir = $(datadir)/@PACKAGE@ | |
| pkglibdir = $(libdir)/@PACKAGE@ | |
| pkgincludedir = $(includedir)/@PACKAGE@ | |
| -top_builddir = . | |
| am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | |
| -INSTALL = @INSTALL@ | |
| install_sh_DATA = $(install_sh) -c -m 644 | |
| install_sh_PROGRAM = $(install_sh) -c | |
| install_sh_SCRIPT = $(install_sh) -c | |
| @@ -36,19 +32,19 @@ | |
| POST_UNINSTALL = : | |
| build_triplet = @build@ | |
| host_triplet = @host@ | |
| +subdir = . | |
| DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \ | |
| $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | |
| $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ | |
| ChangeLog INSTALL NEWS TODO compile config.guess config.sub \ | |
| depcomp install-sh ltmain.sh missing mkinstalldirs | |
| -subdir = . | |
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
| am__aclocal_m4_deps = $(top_srcdir)/m4/klibc.m4 \ | |
| $(top_srcdir)/configure.ac | |
| am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | |
| $(ACLOCAL_M4) | |
| am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ | |
| - configure.lineno configure.status.lineno | |
| + configure.lineno config.status.lineno | |
| mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
| CONFIG_HEADER = config.h | |
| CONFIG_CLEAN_FILES = | |
| @@ -56,10 +52,11 @@ | |
| DIST_SOURCES = | |
| RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ | |
| html-recursive info-recursive install-data-recursive \ | |
| - install-exec-recursive install-info-recursive \ | |
| - install-recursive installcheck-recursive installdirs-recursive \ | |
| - pdf-recursive ps-recursive uninstall-info-recursive \ | |
| - uninstall-recursive | |
| + install-dvi-recursive install-exec-recursive \ | |
| + install-html-recursive install-info-recursive \ | |
| + install-pdf-recursive install-ps-recursive install-recursive \ | |
| + installcheck-recursive installdirs-recursive pdf-recursive \ | |
| + ps-recursive uninstall-recursive | |
| man1dir = $(mandir)/man1 | |
| am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(includedir)" | |
| NROFF = nroff | |
| @@ -72,6 +69,8 @@ | |
| am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; | |
| includeHEADERS_INSTALL = $(INSTALL_HEADER) | |
| HEADERS = $(include_HEADERS) | |
| +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | |
| + distclean-recursive maintainer-clean-recursive | |
| ETAGS = etags | |
| CTAGS = ctags | |
| DIST_SUBDIRS = $(SUBDIRS) | |
| @@ -87,8 +86,6 @@ | |
| distuninstallcheck_listfiles = find . -type f -print | |
| distcleancheck_listfiles = find . -type f -print | |
| ACLOCAL = @ACLOCAL@ | |
| -AMDEP_FALSE = @AMDEP_FALSE@ | |
| -AMDEP_TRUE = @AMDEP_TRUE@ | |
| AMTAR = @AMTAR@ | |
| AR = @AR@ | |
| AUTOCONF = @AUTOCONF@ | |
| @@ -107,6 +104,7 @@ | |
| CYGPATH_W = @CYGPATH_W@ | |
| DEFS = @DEFS@ | |
| DEPDIR = @DEPDIR@ | |
| +DSYMUTIL = @DSYMUTIL@ | |
| ECHO = @ECHO@ | |
| ECHO_C = @ECHO_C@ | |
| ECHO_N = @ECHO_N@ | |
| @@ -116,14 +114,14 @@ | |
| EXTRA_CFLAGS = @EXTRA_CFLAGS@ | |
| F77 = @F77@ | |
| FFLAGS = @FFLAGS@ | |
| +GREP = @GREP@ | |
| +INSTALL = @INSTALL@ | |
| INSTALL_DATA = @INSTALL_DATA@ | |
| INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | |
| KLCC = @KLCC@ | |
| KLIBC = @KLIBC@ | |
| -KLIBC_FALSE = @KLIBC_FALSE@ | |
| -KLIBC_TRUE = @KLIBC_TRUE@ | |
| LDFLAGS = @LDFLAGS@ | |
| LIBOBJS = @LIBOBJS@ | |
| LIBS = @LIBS@ | |
| @@ -131,6 +129,8 @@ | |
| LN_S = @LN_S@ | |
| LTLIBOBJS = @LTLIBOBJS@ | |
| MAKEINFO = @MAKEINFO@ | |
| +MKDIR_P = @MKDIR_P@ | |
| +NMEDIT = @NMEDIT@ | |
| OBJEXT = @OBJEXT@ | |
| PACKAGE = @PACKAGE@ | |
| PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |
| @@ -140,20 +140,18 @@ | |
| PACKAGE_VERSION = @PACKAGE_VERSION@ | |
| PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| RANLIB = @RANLIB@ | |
| +SED = @SED@ | |
| SET_MAKE = @SET_MAKE@ | |
| SHELL = @SHELL@ | |
| STRIP = @STRIP@ | |
| VERSION = @VERSION@ | |
| -ac_ct_AR = @ac_ct_AR@ | |
| +abs_builddir = @abs_builddir@ | |
| +abs_srcdir = @abs_srcdir@ | |
| +abs_top_builddir = @abs_top_builddir@ | |
| +abs_top_srcdir = @abs_top_srcdir@ | |
| ac_ct_CC = @ac_ct_CC@ | |
| ac_ct_CXX = @ac_ct_CXX@ | |
| ac_ct_F77 = @ac_ct_F77@ | |
| -ac_ct_RANLIB = @ac_ct_RANLIB@ | |
| -ac_ct_STRIP = @ac_ct_STRIP@ | |
| -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ | |
| -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ | |
| -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ | |
| -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ | |
| am__include = @am__include@ | |
| am__leading_dot = @am__leading_dot@ | |
| am__quote = @am__quote@ | |
| @@ -165,28 +163,39 @@ | |
| build_cpu = @build_cpu@ | |
| build_os = @build_os@ | |
| build_vendor = @build_vendor@ | |
| +builddir = @builddir@ | |
| datadir = @datadir@ | |
| +datarootdir = @datarootdir@ | |
| +docdir = @docdir@ | |
| +dvidir = @dvidir@ | |
| exec_prefix = @exec_prefix@ | |
| host = @host@ | |
| host_alias = @host_alias@ | |
| host_cpu = @host_cpu@ | |
| host_os = @host_os@ | |
| host_vendor = @host_vendor@ | |
| +htmldir = @htmldir@ | |
| includedir = @includedir@/sysfs | |
| infodir = @infodir@ | |
| install_sh = @install_sh@ | |
| libdir = @libdir@ | |
| libexecdir = @libexecdir@ | |
| +localedir = @localedir@ | |
| localstatedir = @localstatedir@ | |
| mandir = @mandir@ | |
| mkdir_p = @mkdir_p@ | |
| oldincludedir = @oldincludedir@ | |
| +pdfdir = @pdfdir@ | |
| prefix = @prefix@ | |
| program_transform_name = @program_transform_name@ | |
| +psdir = @psdir@ | |
| sbindir = @sbindir@ | |
| sharedstatedir = @sharedstatedir@ | |
| +srcdir = @srcdir@ | |
| sysconfdir = @sysconfdir@ | |
| target_alias = @target_alias@ | |
| +top_builddir = @top_builddir@ | |
| +top_srcdir = @top_srcdir@ | |
| man_MANS = systool.1 | |
| EXTRA_DIST = docs include $(man_MANS) CREDITS lib/LGPL cmd/GPL test/GPL | |
| SUBDIRS = lib cmd test | |
| @@ -232,7 +241,7 @@ | |
| config.h: stamp-h1 | |
| @if test ! -f $@; then \ | |
| rm -f stamp-h1; \ | |
| - $(MAKE) stamp-h1; \ | |
| + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ | |
| else :; fi | |
| stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | |
| @@ -254,10 +263,9 @@ | |
| distclean-libtool: | |
| -rm -f libtool | |
| -uninstall-info-am: | |
| install-man1: $(man1_MANS) $(man_MANS) | |
| @$(NORMAL_INSTALL) | |
| - test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)" | |
| + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" | |
| @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ | |
| l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ | |
| for i in $$l2; do \ | |
| @@ -302,7 +310,7 @@ | |
| done | |
| install-includeHEADERS: $(include_HEADERS) | |
| @$(NORMAL_INSTALL) | |
| - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" | |
| + test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" | |
| @list='$(include_HEADERS)'; for p in $$list; do \ | |
| if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | |
| f=$(am__strip_dir) \ | |
| @@ -349,8 +357,7 @@ | |
| $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ | |
| fi; test -z "$$fail" | |
| -mostlyclean-recursive clean-recursive distclean-recursive \ | |
| -maintainer-clean-recursive: | |
| +$(RECURSIVE_CLEAN_TARGETS): | |
| @failcom='exit 1'; \ | |
| for f in x $$MAKEFLAGS; do \ | |
| case $$f in \ | |
| @@ -394,8 +401,8 @@ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| mkid -fID $$unique | |
| tags: TAGS | |
| @@ -420,8 +427,8 @@ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | |
| test -n "$$unique" || unique=$$empty_fix; \ | |
| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| @@ -431,13 +438,12 @@ | |
| CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ | |
| $(TAGS_FILES) $(LISP) | |
| tags=; \ | |
| - here=`pwd`; \ | |
| list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| test -z "$(CTAGS_ARGS)$$tags$$unique" \ | |
| || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | |
| $$tags $$unique | |
| @@ -452,24 +458,22 @@ | |
| distdir: $(DISTFILES) | |
| $(am__remove_distdir) | |
| - mkdir $(distdir) | |
| - $(mkdir_p) $(distdir)/cmd $(distdir)/include $(distdir)/lib $(distdir)/m4 $(distdir)/test | |
| - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ | |
| - list='$(DISTFILES)'; for file in $$list; do \ | |
| - case $$file in \ | |
| - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ | |
| - esac; \ | |
| + test -d $(distdir) || mkdir $(distdir) | |
| + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + list='$(DISTFILES)'; \ | |
| + dist_files=`for file in $$list; do echo $$file; done | \ | |
| + sed -e "s|^$$srcdirstrip/||;t" \ | |
| + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | |
| + case $$dist_files in \ | |
| + */*) $(MKDIR_P) `echo "$$dist_files" | \ | |
| + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | |
| + sort -u` ;; \ | |
| + esac; \ | |
| + for file in $$dist_files; do \ | |
| if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | |
| - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ | |
| - dir="/$$dir"; \ | |
| - $(mkdir_p) "$(distdir)$$dir"; \ | |
| - else \ | |
| - dir=''; \ | |
| - fi; \ | |
| if test -d $$d/$$file; then \ | |
| + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | |
| cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | |
| fi; \ | |
| @@ -483,7 +487,7 @@ | |
| list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ | |
| if test "$$subdir" = .; then :; else \ | |
| test -d "$(distdir)/$$subdir" \ | |
| - || $(mkdir_p) "$(distdir)/$$subdir" \ | |
| + || $(MKDIR_P) "$(distdir)/$$subdir" \ | |
| || exit 1; \ | |
| distdir=`$(am__cd) $(distdir) && pwd`; \ | |
| top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ | |
| @@ -491,6 +495,8 @@ | |
| $(MAKE) $(AM_MAKEFLAGS) \ | |
| top_distdir="$$top_distdir" \ | |
| distdir="$$distdir/$$subdir" \ | |
| + am__remove_distdir=: \ | |
| + am__skip_length_check=: \ | |
| distdir) \ | |
| || exit 1; \ | |
| fi; \ | |
| @@ -501,7 +507,7 @@ | |
| -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ | |
| ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ | |
| ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ | |
| - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ | |
| + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ | |
| || chmod -R a+r $(distdir) | |
| dist-gzip: distdir | |
| tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz | |
| @@ -511,6 +517,10 @@ | |
| tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 | |
| $(am__remove_distdir) | |
| +dist-lzma: distdir | |
| + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma | |
| + $(am__remove_distdir) | |
| + | |
| dist-tarZ: distdir | |
| tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | |
| $(am__remove_distdir) | |
| @@ -537,6 +547,8 @@ | |
| GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ | |
| *.tar.bz2*) \ | |
| bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ | |
| + *.tar.lzma*) \ | |
| + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ | |
| *.tar.Z*) \ | |
| uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ | |
| *.shar.gz*) \ | |
| @@ -576,7 +588,7 @@ | |
| $(am__remove_distdir) | |
| @(echo "$(distdir) archives ready for distribution: "; \ | |
| list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ | |
| - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' | |
| + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' | |
| distuninstallcheck: | |
| @cd $(distuninstallcheck_dir) \ | |
| && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ | |
| @@ -601,7 +613,7 @@ | |
| installdirs: installdirs-recursive | |
| installdirs-am: | |
| for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(includedir)"; do \ | |
| - test -z "$$dir" || $(mkdir_p) "$$dir"; \ | |
| + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | |
| done | |
| install: install-recursive | |
| install-exec: install-exec-recursive | |
| @@ -649,12 +661,20 @@ | |
| install-data-am: install-includeHEADERS install-man | |
| +install-dvi: install-dvi-recursive | |
| + | |
| install-exec-am: | |
| +install-html: install-html-recursive | |
| + | |
| install-info: install-info-recursive | |
| install-man: install-man1 | |
| +install-pdf: install-pdf-recursive | |
| + | |
| +install-ps: install-ps-recursive | |
| + | |
| installcheck-am: | |
| maintainer-clean: maintainer-clean-recursive | |
| @@ -675,29 +695,30 @@ | |
| ps-am: | |
| -uninstall-am: uninstall-includeHEADERS uninstall-info-am uninstall-man | |
| - | |
| -uninstall-info: uninstall-info-recursive | |
| +uninstall-am: uninstall-includeHEADERS uninstall-man | |
| uninstall-man: uninstall-man1 | |
| -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ | |
| - check-am clean clean-generic clean-libtool clean-recursive \ | |
| - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ | |
| - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ | |
| - distclean-generic distclean-hdr distclean-libtool \ | |
| - distclean-recursive distclean-tags distcleancheck distdir \ | |
| +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ | |
| + install-strip | |
| + | |
| +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | |
| + all all-am am--refresh check check-am clean clean-generic \ | |
| + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ | |
| + dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ | |
| + distcheck distclean distclean-generic distclean-hdr \ | |
| + distclean-libtool distclean-tags distcleancheck distdir \ | |
| distuninstallcheck dvi dvi-am html html-am info info-am \ | |
| - install install-am install-data install-data-am install-exec \ | |
| - install-exec-am install-includeHEADERS install-info \ | |
| - install-info-am install-man install-man1 install-strip \ | |
| + install install-am install-data install-data-am install-dvi \ | |
| + install-dvi-am install-exec install-exec-am install-html \ | |
| + install-html-am install-includeHEADERS install-info \ | |
| + install-info-am install-man install-man1 install-pdf \ | |
| + install-pdf-am install-ps install-ps-am install-strip \ | |
| installcheck installcheck-am installdirs installdirs-am \ | |
| - maintainer-clean maintainer-clean-generic \ | |
| - maintainer-clean-recursive mostlyclean mostlyclean-generic \ | |
| - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ | |
| + maintainer-clean maintainer-clean-generic mostlyclean \ | |
| + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | |
| tags tags-recursive uninstall uninstall-am \ | |
| - uninstall-includeHEADERS uninstall-info-am uninstall-man \ | |
| - uninstall-man1 | |
| + uninstall-includeHEADERS uninstall-man uninstall-man1 | |
| dist-hook: | |
| diff -aruN sysfsutils-2.1.0/test/Makefile.in sysfsutils-2.1.0.N/test/Makefile.in | |
| --- sysfsutils-2.1.0/test/Makefile.in 2006-08-23 01:38:57.000000000 -0700 | |
| +++ sysfsutils-2.1.0.N/test/Makefile.in 2008-12-09 13:18:07.000000000 -0800 | |
| @@ -1,8 +1,8 @@ | |
| -# Makefile.in generated by automake 1.9.6 from Makefile.am. | |
| +# Makefile.in generated by automake 1.10.1 from Makefile.am. | |
| # @configure_input@ | |
| # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | |
| -# 2003, 2004, 2005 Free Software Foundation, Inc. | |
| +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
| # This Makefile.in is free software; the Free Software Foundation | |
| # gives unlimited permission to copy and/or distribute it, | |
| # with or without modifications, as long as this notice is preserved. | |
| @@ -14,15 +14,12 @@ | |
| @SET_MAKE@ | |
| -srcdir = @srcdir@ | |
| -top_srcdir = @top_srcdir@ | |
| + | |
| VPATH = @srcdir@ | |
| pkgdatadir = $(datadir)/@PACKAGE@ | |
| pkglibdir = $(libdir)/@PACKAGE@ | |
| pkgincludedir = $(includedir)/@PACKAGE@ | |
| -top_builddir = .. | |
| am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | |
| -INSTALL = @INSTALL@ | |
| install_sh_DATA = $(install_sh) -c -m 644 | |
| install_sh_PROGRAM = $(install_sh) -c | |
| install_sh_SCRIPT = $(install_sh) -c | |
| @@ -39,7 +36,8 @@ | |
| bin_PROGRAMS = dlist_test$(EXEEXT) get_device$(EXEEXT) \ | |
| get_driver$(EXEEXT) get_module$(EXEEXT) | |
| subdir = test | |
| -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | |
| +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | |
| + $(srcdir)/create-test.sh.in | |
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
| am__aclocal_m4_deps = $(top_srcdir)/m4/klibc.m4 \ | |
| $(top_srcdir)/configure.ac | |
| @@ -47,7 +45,7 @@ | |
| $(ACLOCAL_M4) | |
| mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs | |
| CONFIG_HEADER = $(top_builddir)/config.h | |
| -CONFIG_CLEAN_FILES = | |
| +CONFIG_CLEAN_FILES = create-test.sh | |
| am__installdirs = "$(DESTDIR)$(bindir)" | |
| binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) | |
| PROGRAMS = $(bin_PROGRAMS) | |
| @@ -67,17 +65,19 @@ | |
| get_module_OBJECTS = $(am_get_module_OBJECTS) | |
| get_module_LDADD = $(LDADD) | |
| get_module_DEPENDENCIES = ../lib/libsysfs.la | |
| -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) | |
| +SCRIPTS = $(noinst_SCRIPTS) | |
| +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | |
| depcomp = $(SHELL) $(top_srcdir)/depcomp | |
| am__depfiles_maybe = depfiles | |
| COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | |
| $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ | |
| - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ | |
| - $(AM_CFLAGS) $(CFLAGS) | |
| +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | |
| + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | |
| + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | |
| CCLD = $(CC) | |
| -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | |
| - $(AM_LDFLAGS) $(LDFLAGS) -o $@ | |
| +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | |
| + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | |
| + $(LDFLAGS) -o $@ | |
| SOURCES = dlist_test.c $(get_device_SOURCES) $(get_driver_SOURCES) \ | |
| $(get_module_SOURCES) | |
| DIST_SOURCES = dlist_test.c $(get_device_SOURCES) \ | |
| @@ -86,8 +86,6 @@ | |
| CTAGS = ctags | |
| DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | |
| ACLOCAL = @ACLOCAL@ | |
| -AMDEP_FALSE = @AMDEP_FALSE@ | |
| -AMDEP_TRUE = @AMDEP_TRUE@ | |
| AMTAR = @AMTAR@ | |
| AR = @AR@ | |
| AUTOCONF = @AUTOCONF@ | |
| @@ -106,6 +104,7 @@ | |
| CYGPATH_W = @CYGPATH_W@ | |
| DEFS = @DEFS@ | |
| DEPDIR = @DEPDIR@ | |
| +DSYMUTIL = @DSYMUTIL@ | |
| ECHO = @ECHO@ | |
| ECHO_C = @ECHO_C@ | |
| ECHO_N = @ECHO_N@ | |
| @@ -115,14 +114,14 @@ | |
| EXTRA_CFLAGS = @EXTRA_CLFAGS@ | |
| F77 = @F77@ | |
| FFLAGS = @FFLAGS@ | |
| +GREP = @GREP@ | |
| +INSTALL = @INSTALL@ | |
| INSTALL_DATA = @INSTALL_DATA@ | |
| INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
| INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
| INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | |
| KLCC = @KLCC@ | |
| KLIBC = @KLIBC@ | |
| -KLIBC_FALSE = @KLIBC_FALSE@ | |
| -KLIBC_TRUE = @KLIBC_TRUE@ | |
| LDFLAGS = @LDFLAGS@ | |
| LIBOBJS = @LIBOBJS@ | |
| LIBS = @LIBS@ | |
| @@ -130,6 +129,8 @@ | |
| LN_S = @LN_S@ | |
| LTLIBOBJS = @LTLIBOBJS@ | |
| MAKEINFO = @MAKEINFO@ | |
| +MKDIR_P = @MKDIR_P@ | |
| +NMEDIT = @NMEDIT@ | |
| OBJEXT = @OBJEXT@ | |
| PACKAGE = @PACKAGE@ | |
| PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | |
| @@ -139,20 +140,18 @@ | |
| PACKAGE_VERSION = @PACKAGE_VERSION@ | |
| PATH_SEPARATOR = @PATH_SEPARATOR@ | |
| RANLIB = @RANLIB@ | |
| +SED = @SED@ | |
| SET_MAKE = @SET_MAKE@ | |
| SHELL = @SHELL@ | |
| STRIP = @STRIP@ | |
| VERSION = @VERSION@ | |
| -ac_ct_AR = @ac_ct_AR@ | |
| +abs_builddir = @abs_builddir@ | |
| +abs_srcdir = @abs_srcdir@ | |
| +abs_top_builddir = @abs_top_builddir@ | |
| +abs_top_srcdir = @abs_top_srcdir@ | |
| ac_ct_CC = @ac_ct_CC@ | |
| ac_ct_CXX = @ac_ct_CXX@ | |
| ac_ct_F77 = @ac_ct_F77@ | |
| -ac_ct_RANLIB = @ac_ct_RANLIB@ | |
| -ac_ct_STRIP = @ac_ct_STRIP@ | |
| -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ | |
| -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ | |
| -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ | |
| -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ | |
| am__include = @am__include@ | |
| am__leading_dot = @am__leading_dot@ | |
| am__quote = @am__quote@ | |
| @@ -164,45 +163,58 @@ | |
| build_cpu = @build_cpu@ | |
| build_os = @build_os@ | |
| build_vendor = @build_vendor@ | |
| +builddir = @builddir@ | |
| datadir = @datadir@ | |
| +datarootdir = @datarootdir@ | |
| +docdir = @docdir@ | |
| +dvidir = @dvidir@ | |
| exec_prefix = @exec_prefix@ | |
| host = @host@ | |
| host_alias = @host_alias@ | |
| host_cpu = @host_cpu@ | |
| host_os = @host_os@ | |
| host_vendor = @host_vendor@ | |
| +htmldir = @htmldir@ | |
| includedir = @includedir@ | |
| infodir = @infodir@ | |
| install_sh = @install_sh@ | |
| libdir = @libdir@ | |
| libexecdir = @libexecdir@ | |
| +localedir = @localedir@ | |
| localstatedir = @localstatedir@ | |
| mandir = @mandir@ | |
| mkdir_p = @mkdir_p@ | |
| oldincludedir = @oldincludedir@ | |
| +pdfdir = @pdfdir@ | |
| prefix = @prefix@ | |
| program_transform_name = @program_transform_name@ | |
| +psdir = @psdir@ | |
| sbindir = @sbindir@ | |
| sharedstatedir = @sharedstatedir@ | |
| +srcdir = @srcdir@ | |
| sysconfdir = @sysconfdir@ | |
| target_alias = @target_alias@ | |
| -BUILT_SOURCES = test.h | |
| -CLEANFILES = test.h | |
| +top_builddir = @top_builddir@ | |
| +top_srcdir = @top_srcdir@ | |
| +SUFFIXES = .sh | |
| +noinst_SCRIPTS = create-test | |
| +BUILT_SOURCES = test.h create-test.sh | |
| +CLEANFILES = test.h $(noinst_SCRIPTS) | |
| get_device_SOURCES = get_device.c | |
| get_driver_SOURCES = get_driver.c | |
| get_module_SOURCES = get_module.c | |
| testlibsysfs_SOURCES = test.c test_attr.c test_bus.c test_class.c \ | |
| test_device.c test_driver.c test_module.c test_utils.c \ | |
| - testout.c test-defs.h libsysfs.conf create-test | |
| + testout.c test-defs.h libsysfs.conf | |
| -INCLUDES = -I../include | |
| +INCLUDES = -I$(top_srcdir)/include | |
| LDADD = ../lib/libsysfs.la | |
| AM_CFLAGS = -Wall -W -Wstrict-prototypes $(EXTRA_CLFAGS) | |
| all: $(BUILT_SOURCES) | |
| $(MAKE) $(AM_MAKEFLAGS) all-am | |
| .SUFFIXES: | |
| -.SUFFIXES: .c .lo .o .obj | |
| +.SUFFIXES: .sh .c .lo .o .obj | |
| $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) | |
| @for dep in $?; do \ | |
| case '$(am__configure_deps)' in \ | |
| @@ -232,17 +244,19 @@ | |
| cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| $(ACLOCAL_M4): $(am__aclocal_m4_deps) | |
| cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | |
| +create-test.sh: $(top_builddir)/config.status $(srcdir)/create-test.sh.in | |
| + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ | |
| install-binPROGRAMS: $(bin_PROGRAMS) | |
| @$(NORMAL_INSTALL) | |
| - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" | |
| + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" | |
| @list='$(bin_PROGRAMS)'; for p in $$list; do \ | |
| p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ | |
| if test -f $$p \ | |
| || test -f $$p1 \ | |
| ; then \ | |
| f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ | |
| - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ | |
| - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ | |
| + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ | |
| + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ | |
| else :; fi; \ | |
| done | |
| @@ -262,16 +276,16 @@ | |
| done | |
| dlist_test$(EXEEXT): $(dlist_test_OBJECTS) $(dlist_test_DEPENDENCIES) | |
| @rm -f dlist_test$(EXEEXT) | |
| - $(LINK) $(dlist_test_LDFLAGS) $(dlist_test_OBJECTS) $(dlist_test_LDADD) $(LIBS) | |
| + $(LINK) $(dlist_test_OBJECTS) $(dlist_test_LDADD) $(LIBS) | |
| get_device$(EXEEXT): $(get_device_OBJECTS) $(get_device_DEPENDENCIES) | |
| @rm -f get_device$(EXEEXT) | |
| - $(LINK) $(get_device_LDFLAGS) $(get_device_OBJECTS) $(get_device_LDADD) $(LIBS) | |
| + $(LINK) $(get_device_OBJECTS) $(get_device_LDADD) $(LIBS) | |
| get_driver$(EXEEXT): $(get_driver_OBJECTS) $(get_driver_DEPENDENCIES) | |
| @rm -f get_driver$(EXEEXT) | |
| - $(LINK) $(get_driver_LDFLAGS) $(get_driver_OBJECTS) $(get_driver_LDADD) $(LIBS) | |
| + $(LINK) $(get_driver_OBJECTS) $(get_driver_LDADD) $(LIBS) | |
| get_module$(EXEEXT): $(get_module_OBJECTS) $(get_module_DEPENDENCIES) | |
| @rm -f get_module$(EXEEXT) | |
| - $(LINK) $(get_module_LDFLAGS) $(get_module_OBJECTS) $(get_module_LDADD) $(LIBS) | |
| + $(LINK) $(get_module_OBJECTS) $(get_module_LDADD) $(LIBS) | |
| mostlyclean-compile: | |
| -rm -f *.$(OBJEXT) | |
| @@ -285,22 +299,22 @@ | |
| @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_module.Po@am__quote@ | |
| .c.o: | |
| -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(COMPILE) -c $< | |
| .c.obj: | |
| -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | |
| .c.lo: | |
| -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ | |
| -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi | |
| +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | |
| +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | |
| @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | |
| @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | |
| @@ -311,17 +325,13 @@ | |
| clean-libtool: | |
| -rm -rf .libs _libs | |
| -distclean-libtool: | |
| - -rm -f libtool | |
| -uninstall-info-am: | |
| - | |
| ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | |
| list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| mkid -fID $$unique | |
| tags: TAGS | |
| @@ -333,8 +343,8 @@ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ | |
| test -n "$$unique" || unique=$$empty_fix; \ | |
| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ | |
| @@ -344,13 +354,12 @@ | |
| CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | |
| $(TAGS_FILES) $(LISP) | |
| tags=; \ | |
| - here=`pwd`; \ | |
| list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | |
| unique=`for i in $$list; do \ | |
| if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | |
| done | \ | |
| - $(AWK) ' { files[$$0] = 1; } \ | |
| - END { for (i in files) print i; }'`; \ | |
| + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | |
| + END { if (nonempty) { for (i in files) print i; }; }'`; \ | |
| test -z "$(CTAGS_ARGS)$$tags$$unique" \ | |
| || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | |
| $$tags $$unique | |
| @@ -364,22 +373,21 @@ | |
| -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags | |
| distdir: $(DISTFILES) | |
| - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ | |
| - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ | |
| - list='$(DISTFILES)'; for file in $$list; do \ | |
| - case $$file in \ | |
| - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ | |
| - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ | |
| - esac; \ | |
| + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | |
| + list='$(DISTFILES)'; \ | |
| + dist_files=`for file in $$list; do echo $$file; done | \ | |
| + sed -e "s|^$$srcdirstrip/||;t" \ | |
| + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | |
| + case $$dist_files in \ | |
| + */*) $(MKDIR_P) `echo "$$dist_files" | \ | |
| + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | |
| + sort -u` ;; \ | |
| + esac; \ | |
| + for file in $$dist_files; do \ | |
| if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | |
| - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ | |
| - dir="/$$dir"; \ | |
| - $(mkdir_p) "$(distdir)$$dir"; \ | |
| - else \ | |
| - dir=''; \ | |
| - fi; \ | |
| if test -d $$d/$$file; then \ | |
| + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | |
| if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | |
| cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ | |
| fi; \ | |
| @@ -393,10 +401,10 @@ | |
| check-am: all-am | |
| check: $(BUILT_SOURCES) | |
| $(MAKE) $(AM_MAKEFLAGS) check-am | |
| -all-am: Makefile $(PROGRAMS) | |
| +all-am: Makefile $(PROGRAMS) $(SCRIPTS) | |
| installdirs: | |
| for dir in "$(DESTDIR)$(bindir)"; do \ | |
| - test -z "$$dir" || $(mkdir_p) "$$dir"; \ | |
| + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | |
| done | |
| install: $(BUILT_SOURCES) | |
| $(MAKE) $(AM_MAKEFLAGS) install-am | |
| @@ -433,7 +441,7 @@ | |
| -rm -rf ./$(DEPDIR) | |
| -rm -f Makefile | |
| distclean-am: clean-am distclean-compile distclean-generic \ | |
| - distclean-libtool distclean-tags | |
| + distclean-tags | |
| dvi: dvi-am | |
| @@ -447,12 +455,20 @@ | |
| install-data-am: | |
| +install-dvi: install-dvi-am | |
| + | |
| install-exec-am: install-binPROGRAMS | |
| +install-html: install-html-am | |
| + | |
| install-info: install-info-am | |
| install-man: | |
| +install-pdf: install-pdf-am | |
| + | |
| +install-ps: install-ps-am | |
| + | |
| installcheck-am: | |
| maintainer-clean: maintainer-clean-am | |
| @@ -473,22 +489,34 @@ | |
| ps-am: | |
| -uninstall-am: uninstall-binPROGRAMS uninstall-info-am | |
| +uninstall-am: uninstall-binPROGRAMS | |
| + | |
| +.MAKE: install-am install-strip | |
| .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ | |
| clean-generic clean-libtool ctags distclean distclean-compile \ | |
| distclean-generic distclean-libtool distclean-tags distdir dvi \ | |
| dvi-am html html-am info info-am install install-am \ | |
| - install-binPROGRAMS install-data install-data-am install-exec \ | |
| - install-exec-am install-info install-info-am install-man \ | |
| + install-binPROGRAMS install-data install-data-am install-dvi \ | |
| + install-dvi-am install-exec install-exec-am install-html \ | |
| + install-html-am install-info install-info-am install-man \ | |
| + install-pdf install-pdf-am install-ps install-ps-am \ | |
| install-strip installcheck installcheck-am installdirs \ | |
| maintainer-clean maintainer-clean-generic mostlyclean \ | |
| mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ | |
| pdf pdf-am ps ps-am tags uninstall uninstall-am \ | |
| - uninstall-binPROGRAMS uninstall-info-am | |
| + uninstall-binPROGRAMS | |
| + | |
| -test.h: | |
| - ./create-test | |
| +.sh: | |
| + rm -f $@ $@-t | |
| + cp $< $@-t | |
| + chmod +x $@-t | |
| + mv $@-t $@ | |
| +test.h: $(builddir)/create-test | |
| + $< | |
| +create-test: create-test.sh | |
| +create-test.sh: create-test.sh.in | |
| # Tell versions [3.59,3.63) of GNU make to not export all variables. | |
| # Otherwise a system limit (for SysV at least) may be exceeded. | |
| .NOEXPORT: |