Changeset 54b3065 in mod_gnutls
- Timestamp:
- Jan 11, 2013, 12:57:02 AM (8 years ago)
- Branches:
- debian/master, debian/stretch-backports, jessie-backports
- Children:
- f809816
- Parents:
- 2dd044f (diff), 8ce897a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile.in
r2dd044f r54b3065 1 # Makefile.in generated by automake 1.10 from Makefile.am.1 # Makefile.in generated by automake 1.10.1 from Makefile.am. 2 2 # @configure_input@ 3 3 4 4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.5 # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 121 121 DEFS = @DEFS@ 122 122 DEPDIR = @DEPDIR@ 123 DSYMUTIL = @DSYMUTIL@ 123 124 ECHO = @ECHO@ 124 125 ECHO_C = @ECHO_C@ … … 138 139 LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@ 139 140 LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 140 LIBGNUTLS_EXTRA_CFLAGS = @LIBGNUTLS_EXTRA_CFLAGS@ 141 LIBGNUTLS_EXTRA_CONFIG = @LIBGNUTLS_EXTRA_CONFIG@ 142 LIBGNUTLS_EXTRA_LIBS = @LIBGNUTLS_EXTRA_LIBS@ 141 LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ 143 142 LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ 144 143 LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@ … … 155 154 MODULE_LIBS = @MODULE_LIBS@ 156 155 MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@ 156 NMEDIT = @NMEDIT@ 157 157 OBJEXT = @OBJEXT@ 158 158 OOO_MAINTAIN = @OOO_MAINTAIN@ … … 376 376 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 377 377 done | \ 378 $(AWK) ' { files[$$0]= 1; } \379 END { for (i in files) print i; }'`; \378 $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ 379 END { if (nonempty) { for (i in files) print i; }; }'`; \ 380 380 mkid -fID $$unique 381 381 tags: TAGS … … 402 402 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 403 403 done | \ 404 $(AWK) ' { files[$$0]= 1; } \405 END { for (i in files) print i; }'`; \404 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 405 END { if (nonempty) { for (i in files) print i; }; }'`; \ 406 406 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 407 407 test -n "$$unique" || unique=$$empty_fix; \ … … 413 413 $(TAGS_FILES) $(LISP) 414 414 tags=; \ 415 here=`pwd`; \416 415 list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \ 417 416 unique=`for i in $$list; do \ 418 417 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 419 418 done | \ 420 $(AWK) ' { files[$$0]= 1; } \421 END { for (i in files) print i; }'`; \419 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 420 END { if (nonempty) { for (i in files) print i; }; }'`; \ 422 421 test -z "$(CTAGS_ARGS)$$tags$$unique" \ 423 422 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ … … 489 488 $(am__remove_distdir) 490 489 490 dist-lzma: distdir 491 tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma 492 $(am__remove_distdir) 493 491 494 dist-tarZ: distdir 492 495 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z … … 516 519 *.tar.bz2*) \ 517 520 bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ 521 *.tar.lzma*) \ 522 unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ 518 523 *.tar.Z*) \ 519 524 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ … … 667 672 all all-am am--refresh check check-am clean clean-generic \ 668 673 clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ 669 dist-gzip dist- shar dist-tarZ dist-zip distcheck distclean\670 distclean -generic distclean-hdr distclean-libtool \674 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ 675 distclean distclean-generic distclean-hdr distclean-libtool \ 671 676 distclean-tags distcleancheck distdir distuninstallcheck dvi \ 672 677 dvi-am html html-am info info-am install install-am \ -
NEWS
r2dd044f r54b3065 1 ** Version 0.5.2 (2008-06-29) 2 3 - Depend on gnutls 2.4 which has openpgp support in main library. 4 1 5 ** Version 0.5.1 (2008-03-05) 2 6 -
aclocal.m4
r2dd044f r54b3065 1 # generated automatically by aclocal 1.10 -*- Autoconf -*-1 # generated automatically by aclocal 1.10.1 -*- Autoconf -*- 2 2 3 3 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 4 # 2005, 2006 Free Software Foundation, Inc.4 # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 5 5 # This file is free software; the Free Software Foundation 6 6 # gives unlimited permission to copy and/or distribute it, … … 12 12 # PARTICULAR PURPOSE. 13 13 14 m4_if(m4_PACKAGE_VERSION, [2.61],, 15 [m4_fatal([this file was generated for autoconf 2.61. 16 You have another version of autoconf. If you want to use that, 17 you should regenerate the build system entirely.], [63])]) 14 m4_ifndef([AC_AUTOCONF_VERSION], 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 16 m4_if(AC_AUTOCONF_VERSION, [2.61],, 17 [m4_warning([this file was generated for autoconf 2.61. 18 You have another version of autoconf. It may work, but is not guaranteed to. 19 If you have problems, you may need to regenerate the build system entirely. 20 To do so, use the procedure documented by the package, typically `autoreconf'.])]) 18 21 19 22 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- 20 23 21 # serial 5 1 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL24 # serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL 22 25 23 26 … … 107 110 AC_REQUIRE([AC_EXEEXT])dnl 108 111 dnl 109 110 112 AC_LIBTOOL_SYS_MAX_CMD_LEN 111 113 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE … … 209 211 esac 210 212 213 _LT_REQUIRED_DARWIN_CHECKS 214 211 215 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) 212 216 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], … … 288 292 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 289 293 _lt_linker_boilerplate=`cat conftest.err` 290 $rm conftest*294 $rm -r conftest* 291 295 ])# _LT_LINKER_BOILERPLATE 292 296 297 # _LT_REQUIRED_DARWIN_CHECKS 298 # -------------------------- 299 # Check for some things on darwin 300 AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[ 301 case $host_os in 302 rhapsody* | darwin*) 303 AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) 304 AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) 305 306 AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], 307 [lt_cv_apple_cc_single_mod=no 308 if test -z "${LT_MULTI_MODULE}"; then 309 # By default we will add the -single_module flag. You can override 310 # by either setting the environment variable LT_MULTI_MODULE 311 # non-empty at configure time, or by adding -multi_module to the 312 # link flags. 313 echo "int foo(void){return 1;}" > conftest.c 314 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ 315 -dynamiclib ${wl}-single_module conftest.c 316 if test -f libconftest.dylib; then 317 lt_cv_apple_cc_single_mod=yes 318 rm -rf libconftest.dylib* 319 fi 320 rm conftest.c 321 fi]) 322 AC_CACHE_CHECK([for -exported_symbols_list linker flag], 323 [lt_cv_ld_exported_symbols_list], 324 [lt_cv_ld_exported_symbols_list=no 325 save_LDFLAGS=$LDFLAGS 326 echo "_main" > conftest.sym 327 LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" 328 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], 329 [lt_cv_ld_exported_symbols_list=yes], 330 [lt_cv_ld_exported_symbols_list=no]) 331 LDFLAGS="$save_LDFLAGS" 332 ]) 333 case $host_os in 334 rhapsody* | darwin1.[[0123]]) 335 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 336 darwin1.*) 337 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 338 darwin*) 339 # if running on 10.5 or later, the deployment target defaults 340 # to the OS version, if on x86, and 10.4, the deployment 341 # target defaults to 10.4. Don't you love it? 342 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 343 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) 344 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 345 10.[[012]]*) 346 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 347 10.*) 348 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 349 esac 350 ;; 351 esac 352 if test "$lt_cv_apple_cc_single_mod" = "yes"; then 353 _lt_dar_single_mod='$single_module' 354 fi 355 if test "$lt_cv_ld_exported_symbols_list" = "yes"; then 356 _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' 357 else 358 _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" 359 fi 360 if test "$DSYMUTIL" != ":"; then 361 _lt_dsymutil="~$DSYMUTIL \$lib || :" 362 else 363 _lt_dsymutil= 364 fi 365 ;; 366 esac 367 ]) 293 368 294 369 # _LT_AC_SYS_LIBPATH_AIX … … 615 690 case $lt_cv_prog_gnu_ld in 616 691 yes*) LD="${LD-ld} -m elf64_sparc" ;; 617 *) LD="${LD-ld} -64" ;; 692 *) 693 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then 694 LD="${LD-ld} -64" 695 fi 696 ;; 618 697 esac 619 698 ;; … … 708 787 fi 709 788 fi 710 $rm conftest*789 $rm -r conftest* 711 790 LDFLAGS="$save_LDFLAGS" 712 791 ]) … … 979 1058 [lt_cv_dlopen="shl_load"], 980 1059 [AC_CHECK_LIB([dld], [shl_load], 981 [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="- dld"],1060 [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], 982 1061 [AC_CHECK_FUNC([dlopen], 983 1062 [lt_cv_dlopen="dlopen"], … … 987 1066 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], 988 1067 [AC_CHECK_LIB([dld], [dld_link], 989 [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="- dld"])1068 [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) 990 1069 ]) 991 1070 ]) … … 1304 1383 ;; 1305 1384 1306 aix 4* | aix5*)1385 aix[[4-9]]*) 1307 1386 version_type=linux 1308 1387 need_lib_prefix=no … … 1836 1915 AC_MSG_RESULT([$dynamic_linker]) 1837 1916 test "$dynamic_linker" = no && can_build_shared=no 1917 1918 AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec], 1919 [lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) 1920 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 1921 AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], 1922 [lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) 1923 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 1838 1924 1839 1925 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" … … 2336 2422 2337 2423 case $host_os in 2338 aix 4* | aix5*)2424 aix[[4-9]]*) 2339 2425 lt_cv_deplibs_check_method=pass_all 2340 2426 ;; … … 2772 2858 ;; 2773 2859 2774 aix 4* | aix5*)2860 aix[[4-9]]*) 2775 2861 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 2776 2862 test "$enable_shared" = yes && enable_static=no … … 2829 2915 _LT_AC_TAGVAR(postdeps, $1)= 2830 2916 _LT_AC_TAGVAR(compiler_lib_search_path, $1)= 2917 _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= 2831 2918 2832 2919 # Source file extension for C++ test sources. … … 2938 3025 _LT_AC_TAGVAR(ld_shlibs, $1)=no 2939 3026 ;; 2940 aix 4* | aix5*)3027 aix[[4-9]]*) 2941 3028 if test "$host_cpu" = ia64; then 2942 3029 # On IA64, the linker does run time linking by default, so we don't … … 2951 3038 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 2952 3039 # need to do runtime linking. 2953 case $host_os in aix4.[[23]]|aix4.[[23]].*|aix 5*)3040 case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) 2954 3041 for ld_flag in $LDFLAGS; do 2955 3042 case $ld_flag in … … 3097 3184 ;; 3098 3185 darwin* | rhapsody*) 3099 case $host_os in3100 rhapsody* | darwin1.[[012]])3101 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'3102 ;;3103 *) # Darwin 1.3 on3104 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then3105 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'3106 else3107 case ${MACOSX_DEPLOYMENT_TARGET} in3108 10.[[012]])3109 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'3110 ;;3111 10.*)3112 _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'3113 ;;3114 esac3115 fi3116 ;;3117 esac3118 3186 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no 3119 3187 _LT_AC_TAGVAR(hardcode_direct, $1)=no … … 3122 3190 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' 3123 3191 _LT_AC_TAGVAR(link_all_deplibs, $1)=yes 3124 3125 if test "$GXX" = yes ; then 3126 lt_int_apple_cc_single_mod=no 3192 _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" 3193 if test "$GXX" = yes ; then 3127 3194 output_verbose_link_cmd='echo' 3128 if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then 3129 lt_int_apple_cc_single_mod=yes 3195 _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}" 3196 _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 3197 _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}" 3198 _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}" 3199 if test "$lt_cv_apple_cc_single_mod" != "yes"; then 3200 _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}" 3201 _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}" 3130 3202 fi 3131 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then3132 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'3133 else3134 _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'3135 fi3136 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'3137 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds3138 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then3139 _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}'3140 else3141 _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}'3142 fi3143 _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}'3144 3203 else 3145 3204 case $cc_basename in … … 3392 3451 _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' 3393 3452 ;; 3394 pgCC* )3453 pgCC* | pgcpp*) 3395 3454 # Portland Group C++ compiler 3396 3455 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' … … 3827 3886 # Parse the compiler output and extract the necessary 3828 3887 # objects, libraries and library flags. 3829 AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ 3888 AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], 3889 [AC_REQUIRE([LT_AC_PROG_SED])dnl 3830 3890 dnl we can't use the lt_simple_compile_test_code here, 3831 3891 dnl because it contains code intended for an executable, … … 3952 4012 $rm -f confest.$objext 3953 4013 4014 _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)= 4015 if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then 4016 _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` 4017 fi 4018 3954 4019 # PORTME: override above test on systems where it is broken 3955 4020 ifelse([$1],[CXX], … … 4008 4073 esac 4009 4074 ]) 4010 4011 4075 case " $_LT_AC_TAGVAR(postdeps, $1) " in 4012 4076 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; … … 4093 4157 fi 4094 4158 ;; 4095 aix 4* | aix5*)4159 aix[[4-9]]*) 4096 4160 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 4097 4161 test "$enable_shared" = yes && enable_static=no … … 4270 4334 _LT_AC_TAGVAR(postdeps, $1) \ 4271 4335 _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ 4336 _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \ 4272 4337 _LT_AC_TAGVAR(archive_cmds, $1) \ 4273 4338 _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ … … 4332 4397 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 4333 4398 # 4334 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 4399 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 4335 4400 # Free Software Foundation, Inc. 4336 4401 # … … 4568 4633 # shared library. 4569 4634 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) 4635 4636 # The directories searched by this compiler when creating a shared 4637 # library 4638 compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) 4570 4639 4571 4640 # The library search path used internally by the compiler when linking … … 4918 4987 cat conftest.$ac_ext >&5 4919 4988 fi 4920 rm - f conftest* conftst*4989 rm -rf conftest* conftst* 4921 4990 4922 4991 # Do not use the global_symbol_pipe unless it works. … … 4975 5044 # Although the cygwin gcc ignores -fPIC, still need this for old-style 4976 5045 # (--disable-auto-import) libraries 4977 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' 5046 m4_if([$1], [GCJ], [], 5047 [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 4978 5048 ;; 4979 5049 darwin* | rhapsody*) … … 5012 5082 else 5013 5083 case $host_os in 5014 aix 4* | aix5*)5084 aix[[4-9]]*) 5015 5085 # All AIX code is PIC. 5016 5086 if test "$host_cpu" = ia64; then … … 5108 5178 _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' 5109 5179 ;; 5110 pgCC* )5180 pgCC* | pgcpp*) 5111 5181 # Portland Group C++ compiler. 5112 5182 _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' … … 5259 5329 # Although the cygwin gcc ignores -fPIC, still need this for old-style 5260 5330 # (--disable-auto-import) libraries 5261 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' 5331 m4_if([$1], [GCJ], [], 5332 [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 5262 5333 ;; 5263 5334 … … 5329 5400 # This hack is so that the source file can tell whether it is being 5330 5401 # built for inclusion in a dll (and should export symbols for example). 5331 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' 5402 m4_if([$1], [GCJ], [], 5403 [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) 5332 5404 ;; 5333 5405 … … 5466 5538 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then 5467 5539 AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], 5468 _LT_AC_TAGVAR(lt_ prog_compiler_pic_works, $1),5540 _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), 5469 5541 [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], 5470 5542 [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in … … 5490 5562 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" 5491 5563 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], 5492 _LT_AC_TAGVAR(lt_ prog_compiler_static_works, $1),5564 _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), 5493 5565 $lt_tmp_static_flag, 5494 5566 [], … … 5506 5578 _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 5507 5579 case $host_os in 5508 aix 4* | aix5*)5580 aix[[4-9]]*) 5509 5581 # If we're using GNU nm, then we don't want the "-C" option. 5510 5582 # -C means demangle to AIX nm, but means don't demangle with GNU nm … … 5528 5600 ;; 5529 5601 esac 5602 _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 5530 5603 ],[ 5531 5604 runpath_var= … … 5558 5631 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 5559 5632 # as well as any symbol that contains `d'. 5560 _LT_AC_TAGVAR(exclude_expsyms, $1)= "_GLOBAL_OFFSET_TABLE_"5633 _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] 5561 5634 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 5562 5635 # platforms (ab)use it in PIC code, but their linkers get confused if … … 5564 5637 # rely on this symbol name, it's probably fine to never include it in 5565 5638 # preloaded symbol tables. 5639 # Exclude shared library initialization/finalization symbols. 5640 dnl Note also adjust exclude_expsyms for C++ above. 5566 5641 extract_expsyms_cmds= 5567 5642 # Just being paranoid about ensuring that cc_basename is set. … … 5613 5688 # See if GNU ld supports shared libraries. 5614 5689 case $host_os in 5615 aix 3* | aix4* | aix5*)5690 aix[[3-9]]*) 5616 5691 # On AIX/PPC, the GNU linker is very broken 5617 5692 if test "$host_cpu" != ia64; then … … 5833 5908 ;; 5834 5909 5835 aix 4* | aix5*)5910 aix[[4-9]]*) 5836 5911 if test "$host_cpu" = ia64; then 5837 5912 # On IA64, the linker does run time linking by default, so we don't … … 5853 5928 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 5854 5929 # need to do runtime linking. 5855 case $host_os in aix4.[[23]]|aix4.[[23]].*|aix 5*)5930 case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) 5856 5931 for ld_flag in $LDFLAGS; do 5857 5932 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then … … 6013 6088 if test "$GCC" = yes ; then 6014 6089 output_verbose_link_cmd='echo' 6015 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 6016 _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 6017 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 6018 _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}' 6019 _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}' 6090 _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}" 6091 _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 6092 _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}" 6093 _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}" 6020 6094 else 6021 6095 case $cc_basename in … … 6598 6672 ]) 6599 6673 6600 # Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.6674 # Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. 6601 6675 # 6602 6676 # This file is free software; the Free Software Foundation … … 6613 6687 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 6614 6688 dnl require some minimum version. Point them to the right macro. 6615 m4_if([$1], [1.10 ], [],6689 m4_if([$1], [1.10.1], [], 6616 6690 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 6617 6691 ]) … … 6629 6703 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. 6630 6704 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 6631 [AM_AUTOMAKE_VERSION([1.10])dnl 6632 _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) 6705 [AM_AUTOMAKE_VERSION([1.10.1])dnl 6706 m4_ifndef([AC_AUTOCONF_VERSION], 6707 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 6708 _AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) 6633 6709 6634 6710 # AM_AUX_DIR_EXPAND -*- Autoconf -*- … … 6902 6978 # Grep'ing the whole file is not good either: AIX grep has a line 6903 6979 # limit of 2048, but all sed's we know have understand at least 4000. 6904 if sed 10q "$mf" | grep '^#.*generated by automake' >/dev/null 2>&1; then6980 if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then 6905 6981 dirpart=`AS_DIRNAME("$mf")` 6906 6982 else … … 6962 7038 6963 7039 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 6964 # 2005, 2006 Free Software Foundation, Inc.7040 # 2005, 2006, 2008 Free Software Foundation, Inc. 6965 7041 # 6966 7042 # This file is free software; the Free Software Foundation … … 6968 7044 # with or without modifications, as long as this notice is preserved. 6969 7045 6970 # serial 1 27046 # serial 13 6971 7047 6972 7048 # This macro actually does too much. Some checks are only needed if … … 7073 7149 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], 7074 7150 [# Compute $1's index in $config_headers. 7151 _am_arg=$1 7075 7152 _am_stamp_count=1 7076 7153 for _am_header in $config_headers :; do 7077 7154 case $_am_header in 7078 $ 1 | $1:* )7155 $_am_arg | $_am_arg:* ) 7079 7156 break ;; 7080 7157 * ) … … 7082 7159 esac 7083 7160 done 7084 echo "timestamp for $ 1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])7161 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) 7085 7162 7086 7163 # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. … … 7383 7460 # _AM_SUBST_NOTMAKE(VARIABLE) 7384 7461 # --------------------------- 7385 # Prevent Automake from output ing VARIABLE = @VARIABLE@ in Makefile.in.7462 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. 7386 7463 # This macro is traced by Automake. 7387 7464 AC_DEFUN([_AM_SUBST_NOTMAKE]) -
config/config.guess
r2dd044f r54b3065 5 5 # Inc. 6 6 7 timestamp='2007-0 3-06'7 timestamp='2007-07-22' 8 8 9 9 # This file is free software; you can redistribute it and/or modify it … … 331 331 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 332 332 exit ;; 333 i86pc:SunOS:5.*:* )333 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 334 334 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 335 335 exit ;; … … 794 794 *:Interix*:[3456]*) 795 795 case ${UNAME_MACHINE} in 796 x86) 796 x86) 797 797 echo i586-pc-interix${UNAME_RELEASE} 798 798 exit ;; -
config/config.sub
r2dd044f r54b3065 5 5 # Inc. 6 6 7 timestamp='2007-0 1-18'7 timestamp='2007-06-28' 8 8 9 9 # This file is (in principle) common to ALL GNU software. … … 476 476 os=-unicosmp 477 477 ;; 478 cr16 c)479 basic_machine=cr16 c-unknown478 cr16) 479 basic_machine=cr16-unknown 480 480 os=-elf 481 481 ;; … … 683 683 basic_machine=i386-pc 684 684 os=-mingw32 685 ;; 686 mingw32ce) 687 basic_machine=arm-unknown 688 os=-mingw32ce 685 689 ;; 686 690 miniframe) -
config/depcomp
r2dd044f r54b3065 2 2 # depcomp - compile a program generating dependencies as side-effects 3 3 4 scriptversion=200 6-10-15.185 6 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software4 scriptversion=2007-03-29.01 5 6 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software 7 7 # Foundation, Inc. 8 8 … … 216 216 # start of each line; $object doesn't have directory information. 217 217 # Version 6 uses the directory in both cases. 218 stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` 219 tmpdepfile="$stripped.u" 218 dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` 219 test "x$dir" = "x$object" && dir= 220 base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` 220 221 if test "$libtool" = yes; then 222 tmpdepfile1=$dir$base.u 223 tmpdepfile2=$base.u 224 tmpdepfile3=$dir.libs/$base.u 221 225 "$@" -Wc,-M 222 226 else 227 tmpdepfile1=$dir$base.u 228 tmpdepfile2=$dir$base.u 229 tmpdepfile3=$dir$base.u 223 230 "$@" -M 224 231 fi 225 232 stat=$? 226 233 227 if test -f "$tmpdepfile"; then :228 else229 stripped=`echo "$stripped" | sed 's,^.*/,,'`230 tmpdepfile="$stripped.u"231 fi232 233 234 if test $stat -eq 0; then : 234 235 else 235 rm -f "$tmpdepfile "236 rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" 236 237 exit $stat 237 238 fi 238 239 240 for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" 241 do 242 test -f "$tmpdepfile" && break 243 done 239 244 if test -f "$tmpdepfile"; then 240 outname="$stripped.o"241 245 # Each line is of the form `foo.o: dependent.h'. 242 246 # Do two passes, one to just change these to 243 247 # `$object: dependent.h' and one to simply `dependent.h:'. 244 sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" 245 sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" 248 sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" 249 # That's a tab and a space in the []. 250 sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" 246 251 else 247 252 # The sourcefile does not contain any dependencies, so just -
config/install-sh
r2dd044f r54b3065 2 2 # install - install a program, script, or datafile 3 3 4 scriptversion=2006-1 0-14.154 scriptversion=2006-12-25.00 5 5 6 6 # This originates from X11R5 (mit/util/scripts/install.sh), which was … … 49 49 50 50 # Don't use :- since 4.3BSD and earlier shells don't like it. 51 doit= "${DOITPROG-}"51 doit=${DOITPROG-} 52 52 if test -z "$doit"; then 53 53 doit_exec=exec … … 59 59 # or use environment vars. 60 60 61 mvprog="${MVPROG-mv}" 62 cpprog="${CPPROG-cp}" 63 chmodprog="${CHMODPROG-chmod}" 64 chownprog="${CHOWNPROG-chown}" 65 chgrpprog="${CHGRPPROG-chgrp}" 66 stripprog="${STRIPPROG-strip}" 67 rmprog="${RMPROG-rm}" 68 mkdirprog="${MKDIRPROG-mkdir}" 69 70 posix_glob= 61 chgrpprog=${CHGRPPROG-chgrp} 62 chmodprog=${CHMODPROG-chmod} 63 chownprog=${CHOWNPROG-chown} 64 cmpprog=${CMPPROG-cmp} 65 cpprog=${CPPROG-cp} 66 mkdirprog=${MKDIRPROG-mkdir} 67 mvprog=${MVPROG-mv} 68 rmprog=${RMPROG-rm} 69 stripprog=${STRIPPROG-strip} 70 71 posix_glob='?' 72 initialize_posix_glob=' 73 test "$posix_glob" != "?" || { 74 if (set -f) 2>/dev/null; then 75 posix_glob= 76 else 77 posix_glob=: 78 fi 79 } 80 ' 81 71 82 posix_mkdir= 72 83 … … 74 85 mode=0755 75 86 87 chgrpcmd= 76 88 chmodcmd=$chmodprog 77 89 chowncmd= 78 chgrpcmd= 90 mvcmd=$mvprog 91 rmcmd="$rmprog -f" 79 92 stripcmd= 80 rmcmd="$rmprog -f" 81 mvcmd="$mvprog" 93 82 94 src= 83 95 dst= 84 96 dir_arg= 85 dstarg= 97 dst_arg= 98 99 copy_on_change=false 86 100 no_target_directory= 87 101 88 usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE 102 usage="\ 103 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE 89 104 or: $0 [OPTION]... SRCFILES... DIRECTORY 90 105 or: $0 [OPTION]... -t DIRECTORY SRCFILES... … … 96 111 97 112 Options: 98 -c (ignored) 99 -d create directories instead of installing files. 100 -g GROUP $chgrpprog installed files to GROUP. 101 -m MODE $chmodprog installed files to MODE. 102 -o USER $chownprog installed files to USER. 103 -s $stripprog installed files. 104 -t DIRECTORY install into DIRECTORY. 105 -T report an error if DSTFILE is a directory. 106 --help display this help and exit. 107 --version display version info and exit. 113 --help display this help and exit. 114 --version display version info and exit. 115 116 -c (ignored) 117 -C install only if different (preserve the last data modification time) 118 -d create directories instead of installing files. 119 -g GROUP $chgrpprog installed files to GROUP. 120 -m MODE $chmodprog installed files to MODE. 121 -o USER $chownprog installed files to USER. 122 -s $stripprog installed files. 123 -t DIRECTORY install into DIRECTORY. 124 -T report an error if DSTFILE is a directory. 108 125 109 126 Environment variables override the default commands: 110 CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG 127 CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG 128 RMPROG STRIPPROG 111 129 " 112 130 113 131 while test $# -ne 0; do 114 132 case $1 in 115 -c) shift 116 continue;; 117 118 -d) dir_arg=true 119 shift 120 continue;; 133 -c) ;; 134 135 -C) copy_on_change=true;; 136 137 -d) dir_arg=true;; 121 138 122 139 -g) chgrpcmd="$chgrpprog $2" 123 shift 124 shift 125 continue;; 140 shift;; 126 141 127 142 --help) echo "$usage"; exit $?;; 128 143 129 144 -m) mode=$2 130 shift131 shift132 145 case $mode in 133 146 *' '* | *' '* | *' … … 136 149 exit 1;; 137 150 esac 138 continue;;151 shift;; 139 152 140 153 -o) chowncmd="$chownprog $2" 141 shift 142 shift 143 continue;; 144 145 -s) stripcmd=$stripprog 146 shift 147 continue;; 148 149 -t) dstarg=$2 150 shift 151 shift 152 continue;; 153 154 -T) no_target_directory=true 155 shift 156 continue;; 154 shift;; 155 156 -s) stripcmd=$stripprog;; 157 158 -t) dst_arg=$2 159 shift;; 160 161 -T) no_target_directory=true;; 157 162 158 163 --version) echo "$0 $scriptversion"; exit $?;; … … 166 171 *) break;; 167 172 esac 173 shift 168 174 done 169 175 170 if test $# -ne 0 && test -z "$dir_arg$dst arg"; then176 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then 171 177 # When -d is used, all remaining arguments are directories to create. 172 178 # When -t is used, the destination is already specified. … … 174 180 for arg 175 181 do 176 if test -n "$dst arg"; then182 if test -n "$dst_arg"; then 177 183 # $@ is not empty: it contains at least $arg. 178 set fnord "$@" "$dst arg"184 set fnord "$@" "$dst_arg" 179 185 shift # fnord 180 186 fi 181 187 shift # arg 182 dst arg=$arg188 dst_arg=$arg 183 189 done 184 190 fi … … 225 231 # Protect names starting with `-'. 226 232 case $src in 227 -*) src=./$src 233 -*) src=./$src;; 228 234 esac 229 235 … … 243 249 fi 244 250 245 if test -z "$dst arg"; then251 if test -z "$dst_arg"; then 246 252 echo "$0: no destination specified." >&2 247 253 exit 1 248 254 fi 249 255 250 dst=$dst arg256 dst=$dst_arg 251 257 # Protect names starting with `-'. 252 258 case $dst in 253 -*) dst=./$dst 259 -*) dst=./$dst;; 254 260 esac 255 261 … … 258 264 if test -d "$dst"; then 259 265 if test -n "$no_target_directory"; then 260 echo "$0: $dst arg: Is a directory" >&2266 echo "$0: $dst_arg: Is a directory" >&2 261 267 exit 1 262 268 fi … … 379 385 380 386 case $dstdir in 381 /*) prefix= /;;382 -*) prefix= ./;;383 *) prefix= 387 /*) prefix='/';; 388 -*) prefix='./';; 389 *) prefix='';; 384 390 esac 385 391 386 case $posix_glob in 387 '') 388 if (set -f) 2>/dev/null; then 389 posix_glob=true 390 else 391 posix_glob=false 392 fi ;; 393 esac 392 eval "$initialize_posix_glob" 394 393 395 394 oIFS=$IFS 396 395 IFS=/ 397 $posix_glob &&set -f396 $posix_glob set -f 398 397 set fnord $dstdir 399 398 shift 400 $posix_glob &&set +f399 $posix_glob set +f 401 400 IFS=$oIFS 402 401 … … 460 459 # errors from the above "$doit $cpprog $src $dsttmp" command. 461 460 # 462 { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ 463 && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ 464 && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ 465 && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && 466 467 # Now rename the file to the real destination. 468 { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ 469 || { 470 # The rename failed, perhaps because mv can't rename something else 471 # to itself, or perhaps because mv is so ancient that it does not 472 # support -f. 473 474 # Now remove or move aside any old file at destination location. 475 # We try this two ways since rm can't unlink itself on some 476 # systems and the destination file might be busy for other 477 # reasons. In this case, the final cleanup might fail but the new 478 # file should still install successfully. 479 { 480 if test -f "$dst"; then 481 $doit $rmcmd -f "$dst" 2>/dev/null \ 482 || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ 483 && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ 484 || { 485 echo "$0: cannot unlink or rename $dst" >&2 486 (exit 1); exit 1 487 } 488 else 489 : 490 fi 491 } && 492 493 # Now rename the file to the real destination. 494 $doit $mvcmd "$dsttmp" "$dst" 495 } 496 } || exit 1 461 { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && 462 { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && 463 { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && 464 { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && 465 466 # If -C, don't bother to copy if it wouldn't change the file. 467 if $copy_on_change && 468 old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && 469 new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && 470 471 eval "$initialize_posix_glob" && 472 $posix_glob set -f && 473 set X $old && old=:$2:$4:$5:$6 && 474 set X $new && new=:$2:$4:$5:$6 && 475 $posix_glob set +f && 476 477 test "$old" = "$new" && 478 $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 479 then 480 rm -f "$dsttmp" 481 else 482 # Rename the file to the real destination. 483 $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || 484 485 # The rename failed, perhaps because mv can't rename something else 486 # to itself, or perhaps because mv is so ancient that it does not 487 # support -f. 488 { 489 # Now remove or move aside any old file at destination location. 490 # We try this two ways since rm can't unlink itself on some 491 # systems and the destination file might be busy for other 492 # reasons. In this case, the final cleanup might fail but the new 493 # file should still install successfully. 494 { 495 test ! -f "$dst" || 496 $doit $rmcmd -f "$dst" 2>/dev/null || 497 { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && 498 { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } 499 } || 500 { echo "$0: cannot unlink or rename $dst" >&2 501 (exit 1); exit 1 502 } 503 } && 504 505 # Now rename the file to the real destination. 506 $doit $mvcmd "$dsttmp" "$dst" 507 } 508 fi || exit 1 497 509 498 510 trap '' 0 -
config/ltmain.sh
r2dd044f r54b3065 3 3 # 4 4 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 5 # 2007 Free Software Foundation, Inc.5 # 2007, 2008 Free Software Foundation, Inc. 6 6 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7 7 # … … 44 44 PROGRAM=ltmain.sh 45 45 PACKAGE=libtool 46 VERSION="1.5.2 4 Debian 1.5.24-1ubuntu1"47 TIMESTAMP=" (1.1220.2.4 56 2007/06/24 02:25:32)"46 VERSION="1.5.26 Debian 1.5.26-1ubuntu1" 47 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" 48 48 49 49 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). … … 114 114 # e.g. LANG=C (notably SCO). 115 115 # We save the old values to restore during execute mode. 116 for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 116 lt_env= 117 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 117 118 do 118 119 eval "if test \"\${$lt_var+set}\" = set; then 119 120 save_$lt_var=\$$lt_var 121 lt_env=\"$lt_var=\$$lt_var \$lt_env\" 120 122 $lt_var=C 121 123 export $lt_var 122 124 fi" 123 125 done 126 127 if test -n "$lt_env"; then 128 lt_env="env $lt_env" 129 fi 124 130 125 131 # Make sure IFS has a sensible default … … 486 492 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP 487 493 488 Copyright (C) 200 7Free Software Foundation, Inc.494 Copyright (C) 2008 Free Software Foundation, Inc. 489 495 This is free software; see the source for copying conditions. There is NO 490 496 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." … … 789 795 *.java) xform=java ;; 790 796 *.obj) xform=obj ;; 797 *.sx) xform=sx ;; 791 798 esac 792 799 … … 957 964 958 965 $show "$command" 959 if $run eval "$command"; then :966 if $run eval $lt_env "$command"; then : 960 967 else 961 968 test -n "$output_obj" && $run $rm $removelist … … 1029 1036 $run $rm "$obj" "$output_obj" 1030 1037 $show "$command" 1031 if $run eval "$command"; then :1038 if $run eval $lt_env "$command"; then : 1032 1039 else 1033 1040 $run $rm $removelist … … 1162 1169 vinfo= 1163 1170 vinfo_number=no 1171 single_module="${wl}-single_module" 1164 1172 1165 1173 func_infer_tag $base_compile … … 1647 1655 ;; 1648 1656 1657 -multi_module) 1658 single_module="${wl}-multi_module" 1659 continue 1660 ;; 1661 1649 1662 -module) 1650 1663 module=yes … … 2153 2166 fi 2154 2167 name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` 2155 for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do 2168 if test "$linkmode" = lib; then 2169 searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" 2170 else 2171 searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" 2172 fi 2173 for searchdir in $searchdirs; do 2156 2174 for search_ext in .la $std_shrext .so .a; do 2157 2175 # Search the libtool library … … 2949 2967 # but need to link against shared 2950 2968 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` 2969 eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 2951 2970 if test -n "$deplibrary_names" ; then 2952 2971 for tmp in $deplibrary_names ; do 2953 2972 depdepl=$tmp 2954 2973 done 2955 if test -f "$path/$depdepl" ; then 2974 if test -f "$deplibdir/$depdepl" ; then 2975 depdepl="$deplibdir/$depdepl" 2976 elif test -f "$path/$depdepl" ; then 2956 2977 depdepl="$path/$depdepl" 2978 else 2979 # Can't find it, oh well... 2980 depdepl= 2957 2981 fi 2958 2982 # do not add paths which are already there … … 3102 3126 case $linkmode in 3103 3127 oldlib) 3104 if test -n "$deplibs"; then 3105 $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 3106 fi 3128 case " $deplibs" in 3129 *\ -l* | *\ -L*) 3130 $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; 3131 esac 3107 3132 3108 3133 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then … … 4246 4271 4247 4272 obj) 4248 if test -n "$deplibs"; then 4249 $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 4250 fi 4273 case " $deplibs" in 4274 *\ -l* | *\ -L*) 4275 $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; 4276 esac 4251 4277 4252 4278 if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then … … 6487 6513 6488 6514 # Restore saved environment variables 6489 for lt_var in LANG L C_ALL LC_CTYPE LC_COLLATE LC_MESSAGES6515 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES 6490 6516 do 6491 6517 eval "if test \"\${save_$lt_var+set}\" = set; then -
configure
r2dd044f r54b3065 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 # Generated by GNU Autoconf 2.61 for mod_gnutls 0.5. 1.3 # Generated by GNU Autoconf 2.61 for mod_gnutls 0.5.2. 4 4 # 5 5 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, … … 727 727 PACKAGE_NAME='mod_gnutls' 728 728 PACKAGE_TARNAME='mod_gnutls' 729 PACKAGE_VERSION='0.5. 1'730 PACKAGE_STRING='mod_gnutls 0.5. 1'729 PACKAGE_VERSION='0.5.2' 730 PACKAGE_STRING='mod_gnutls 0.5.2' 731 731 PACKAGE_BUGREPORT='' 732 732 … … 867 867 AR 868 868 RANLIB 869 DSYMUTIL 870 NMEDIT 869 871 CPP 870 872 CXX … … 903 905 APXS_EXTENSION 904 906 APXS_CFLAGS 905 LIBGNUTLS_EXTRA_CONFIG 906 LIBGNUTLS_EXTRA_CFLAGS 907 LIBGNUTLS_EXTRA_LIBS 907 LIBGNUTLS_CONFIG 908 908 LIBGNUTLS_CFLAGS 909 909 LIBGNUTLS_LIBS … … 1436 1436 # This message is too long to be a string in the A/UX 3.1 sh. 1437 1437 cat <<_ACEOF 1438 \`configure' configures mod_gnutls 0.5. 1to adapt to many kinds of systems.1438 \`configure' configures mod_gnutls 0.5.2 to adapt to many kinds of systems. 1439 1439 1440 1440 Usage: $0 [OPTION]... [VAR=VALUE]... … … 1507 1507 if test -n "$ac_init_help"; then 1508 1508 case $ac_init_help in 1509 short | recursive ) echo "Configuration of mod_gnutls 0.5. 1:";;1509 short | recursive ) echo "Configuration of mod_gnutls 0.5.2:";; 1510 1510 esac 1511 1511 cat <<\_ACEOF … … 1536 1536 --with-tags[=TAGS] include additional configurations [automatic] 1537 1537 --with-apxs=PATH Path to apxs 1538 --with-libgnutls- extra-prefix=PFX Prefix where libgnutls-extrais installed (optional)1538 --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional) 1539 1539 --with-apr-memcache-prefix=PATH 1540 1540 Install prefix for apr_memcache … … 1622 1622 if $ac_init_version; then 1623 1623 cat <<\_ACEOF 1624 mod_gnutls configure 0.5. 11624 mod_gnutls configure 0.5.2 1625 1625 generated by GNU Autoconf 2.61 1626 1626 … … 1636 1636 running configure, to aid debugging if configure makes a mistake. 1637 1637 1638 It was created by mod_gnutls $as_me 0.5. 1, which was1638 It was created by mod_gnutls $as_me 0.5.2, which was 1639 1639 generated by GNU Autoconf 2.61. Invocation command line was 1640 1640 … … 2007 2007 chmod +x config.nice 2008 2008 2009 MOD_GNUTLS_VERSION=0.5. 12009 MOD_GNUTLS_VERSION=0.5.2 2010 2010 2011 2011 … … 2508 2508 # Define the identity of the package. 2509 2509 PACKAGE=mod_gnutls 2510 VERSION=0.5. 12510 VERSION=0.5.2 2511 2511 2512 2512 … … 4337 4337 4338 4338 case $host_os in 4339 aix 4* | aix5*)4339 aix[4-9]*) 4340 4340 lt_cv_deplibs_check_method=pass_all 4341 4341 ;; … … 4725 4725 case $lt_cv_prog_gnu_ld in 4726 4726 yes*) LD="${LD-ld} -m elf64_sparc" ;; 4727 *) LD="${LD-ld} -64" ;; 4727 *) 4728 if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then 4729 LD="${LD-ld} -64" 4730 fi 4731 ;; 4728 4732 esac 4729 4733 ;; … … 6322 6326 6323 6327 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! 6324 6325 6328 # find the maximum length of command line arguments 6326 6329 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 … … 6637 6640 cat conftest.$ac_ext >&5 6638 6641 fi 6639 rm - f conftest* conftst*6642 rm -rf conftest* conftst* 6640 6643 6641 6644 # Do not use the global_symbol_pipe unless it works. … … 7197 7200 esac 7198 7201 7202 7203 case $host_os in 7204 rhapsody* | darwin*) 7205 if test -n "$ac_tool_prefix"; then 7206 # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. 7207 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 7208 { echo "$as_me:$LINENO: checking for $ac_word" >&5 7209 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 7210 if test "${ac_cv_prog_DSYMUTIL+set}" = set; then 7211 echo $ECHO_N "(cached) $ECHO_C" >&6 7212 else 7213 if test -n "$DSYMUTIL"; then 7214 ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. 7215 else 7216 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7217 for as_dir in $PATH 7218 do 7219 IFS=$as_save_IFS 7220 test -z "$as_dir" && as_dir=. 7221 for ac_exec_ext in '' $ac_executable_extensions; do 7222 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7223 ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" 7224 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 7225 break 2 7226 fi 7227 done 7228 done 7229 IFS=$as_save_IFS 7230 7231 fi 7232 fi 7233 DSYMUTIL=$ac_cv_prog_DSYMUTIL 7234 if test -n "$DSYMUTIL"; then 7235 { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 7236 echo "${ECHO_T}$DSYMUTIL" >&6; } 7237 else 7238 { echo "$as_me:$LINENO: result: no" >&5 7239 echo "${ECHO_T}no" >&6; } 7240 fi 7241 7242 7243 fi 7244 if test -z "$ac_cv_prog_DSYMUTIL"; then 7245 ac_ct_DSYMUTIL=$DSYMUTIL 7246 # Extract the first word of "dsymutil", so it can be a program name with args. 7247 set dummy dsymutil; ac_word=$2 7248 { echo "$as_me:$LINENO: checking for $ac_word" >&5 7249 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 7250 if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then 7251 echo $ECHO_N "(cached) $ECHO_C" >&6 7252 else 7253 if test -n "$ac_ct_DSYMUTIL"; then 7254 ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. 7255 else 7256 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7257 for as_dir in $PATH 7258 do 7259 IFS=$as_save_IFS 7260 test -z "$as_dir" && as_dir=. 7261 for ac_exec_ext in '' $ac_executable_extensions; do 7262 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7263 ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" 7264 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 7265 break 2 7266 fi 7267 done 7268 done 7269 IFS=$as_save_IFS 7270 7271 fi 7272 fi 7273 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL 7274 if test -n "$ac_ct_DSYMUTIL"; then 7275 { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 7276 echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } 7277 else 7278 { echo "$as_me:$LINENO: result: no" >&5 7279 echo "${ECHO_T}no" >&6; } 7280 fi 7281 7282 if test "x$ac_ct_DSYMUTIL" = x; then 7283 DSYMUTIL=":" 7284 else 7285 case $cross_compiling:$ac_tool_warned in 7286 yes:) 7287 { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools 7288 whose name does not start with the host triplet. If you think this 7289 configuration is useful to you, please write to autoconf@gnu.org." >&5 7290 echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools 7291 whose name does not start with the host triplet. If you think this 7292 configuration is useful to you, please write to autoconf@gnu.org." >&2;} 7293 ac_tool_warned=yes ;; 7294 esac 7295 DSYMUTIL=$ac_ct_DSYMUTIL 7296 fi 7297 else 7298 DSYMUTIL="$ac_cv_prog_DSYMUTIL" 7299 fi 7300 7301 if test -n "$ac_tool_prefix"; then 7302 # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. 7303 set dummy ${ac_tool_prefix}nmedit; ac_word=$2 7304 { echo "$as_me:$LINENO: checking for $ac_word" >&5 7305 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 7306 if test "${ac_cv_prog_NMEDIT+set}" = set; then 7307 echo $ECHO_N "(cached) $ECHO_C" >&6 7308 else 7309 if test -n "$NMEDIT"; then 7310 ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. 7311 else 7312 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7313 for as_dir in $PATH 7314 do 7315 IFS=$as_save_IFS 7316 test -z "$as_dir" && as_dir=. 7317 for ac_exec_ext in '' $ac_executable_extensions; do 7318 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7319 ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" 7320 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 7321 break 2 7322 fi 7323 done 7324 done 7325 IFS=$as_save_IFS 7326 7327 fi 7328 fi 7329 NMEDIT=$ac_cv_prog_NMEDIT 7330 if test -n "$NMEDIT"; then 7331 { echo "$as_me:$LINENO: result: $NMEDIT" >&5 7332 echo "${ECHO_T}$NMEDIT" >&6; } 7333 else 7334 { echo "$as_me:$LINENO: result: no" >&5 7335 echo "${ECHO_T}no" >&6; } 7336 fi 7337 7338 7339 fi 7340 if test -z "$ac_cv_prog_NMEDIT"; then 7341 ac_ct_NMEDIT=$NMEDIT 7342 # Extract the first word of "nmedit", so it can be a program name with args. 7343 set dummy nmedit; ac_word=$2 7344 { echo "$as_me:$LINENO: checking for $ac_word" >&5 7345 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 7346 if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then 7347 echo $ECHO_N "(cached) $ECHO_C" >&6 7348 else 7349 if test -n "$ac_ct_NMEDIT"; then 7350 ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. 7351 else 7352 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 7353 for as_dir in $PATH 7354 do 7355 IFS=$as_save_IFS 7356 test -z "$as_dir" && as_dir=. 7357 for ac_exec_ext in '' $ac_executable_extensions; do 7358 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 7359 ac_cv_prog_ac_ct_NMEDIT="nmedit" 7360 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 7361 break 2 7362 fi 7363 done 7364 done 7365 IFS=$as_save_IFS 7366 7367 fi 7368 fi 7369 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT 7370 if test -n "$ac_ct_NMEDIT"; then 7371 { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 7372 echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } 7373 else 7374 { echo "$as_me:$LINENO: result: no" >&5 7375 echo "${ECHO_T}no" >&6; } 7376 fi 7377 7378 if test "x$ac_ct_NMEDIT" = x; then 7379 NMEDIT=":" 7380 else 7381 case $cross_compiling:$ac_tool_warned in 7382 yes:) 7383 { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools 7384 whose name does not start with the host triplet. If you think this 7385 configuration is useful to you, please write to autoconf@gnu.org." >&5 7386 echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools 7387 whose name does not start with the host triplet. If you think this 7388 configuration is useful to you, please write to autoconf@gnu.org." >&2;} 7389 ac_tool_warned=yes ;; 7390 esac 7391 NMEDIT=$ac_ct_NMEDIT 7392 fi 7393 else 7394 NMEDIT="$ac_cv_prog_NMEDIT" 7395 fi 7396 7397 7398 { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 7399 echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } 7400 if test "${lt_cv_apple_cc_single_mod+set}" = set; then 7401 echo $ECHO_N "(cached) $ECHO_C" >&6 7402 else 7403 lt_cv_apple_cc_single_mod=no 7404 if test -z "${LT_MULTI_MODULE}"; then 7405 # By default we will add the -single_module flag. You can override 7406 # by either setting the environment variable LT_MULTI_MODULE 7407 # non-empty at configure time, or by adding -multi_module to the 7408 # link flags. 7409 echo "int foo(void){return 1;}" > conftest.c 7410 $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ 7411 -dynamiclib ${wl}-single_module conftest.c 7412 if test -f libconftest.dylib; then 7413 lt_cv_apple_cc_single_mod=yes 7414 rm -rf libconftest.dylib* 7415 fi 7416 rm conftest.c 7417 fi 7418 fi 7419 { echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 7420 echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } 7421 { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 7422 echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } 7423 if test "${lt_cv_ld_exported_symbols_list+set}" = set; then 7424 echo $ECHO_N "(cached) $ECHO_C" >&6 7425 else 7426 lt_cv_ld_exported_symbols_list=no 7427 save_LDFLAGS=$LDFLAGS 7428 echo "_main" > conftest.sym 7429 LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" 7430 cat >conftest.$ac_ext <<_ACEOF 7431 /* confdefs.h. */ 7432 _ACEOF 7433 cat confdefs.h >>conftest.$ac_ext 7434 cat >>conftest.$ac_ext <<_ACEOF 7435 /* end confdefs.h. */ 7436 7437 int 7438 main () 7439 { 7440 7441 ; 7442 return 0; 7443 } 7444 _ACEOF 7445 rm -f conftest.$ac_objext conftest$ac_exeext 7446 if { (ac_try="$ac_link" 7447 case "(($ac_try" in 7448 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 7449 *) ac_try_echo=$ac_try;; 7450 esac 7451 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 7452 (eval "$ac_link") 2>conftest.er1 7453 ac_status=$? 7454 grep -v '^ *+' conftest.er1 >conftest.err 7455 rm -f conftest.er1 7456 cat conftest.err >&5 7457 echo "$as_me:$LINENO: \$? = $ac_status" >&5 7458 (exit $ac_status); } && { 7459 test -z "$ac_c_werror_flag" || 7460 test ! -s conftest.err 7461 } && test -s conftest$ac_exeext && 7462 $as_test_x conftest$ac_exeext; then 7463 lt_cv_ld_exported_symbols_list=yes 7464 else 7465 echo "$as_me: failed program was:" >&5 7466 sed 's/^/| /' conftest.$ac_ext >&5 7467 7468 lt_cv_ld_exported_symbols_list=no 7469 fi 7470 7471 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 7472 conftest$ac_exeext conftest.$ac_ext 7473 LDFLAGS="$save_LDFLAGS" 7474 7475 fi 7476 { echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 7477 echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } 7478 case $host_os in 7479 rhapsody* | darwin1.[0123]) 7480 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 7481 darwin1.*) 7482 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 7483 darwin*) 7484 # if running on 10.5 or later, the deployment target defaults 7485 # to the OS version, if on x86, and 10.4, the deployment 7486 # target defaults to 10.4. Don't you love it? 7487 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 7488 10.0,*86*-darwin8*|10.0,*-darwin[91]*) 7489 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 7490 10.[012]*) 7491 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 7492 10.*) 7493 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 7494 esac 7495 ;; 7496 esac 7497 if test "$lt_cv_apple_cc_single_mod" = "yes"; then 7498 _lt_dar_single_mod='$single_module' 7499 fi 7500 if test "$lt_cv_ld_exported_symbols_list" = "yes"; then 7501 _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' 7502 else 7503 _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}" 7504 fi 7505 if test "$DSYMUTIL" != ":"; then 7506 _lt_dsymutil="~$DSYMUTIL \$lib || :" 7507 else 7508 _lt_dsymutil= 7509 fi 7510 ;; 7511 esac 7512 7513 7199 7514 enable_dlopen=no 7200 7515 enable_win32_dll=no … … 7262 7577 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 7263 7578 _lt_linker_boilerplate=`cat conftest.err` 7264 $rm conftest*7579 $rm -r conftest* 7265 7580 7266 7581 … … 7290 7605 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7291 7606 -e 's:$: $lt_compiler_flag:'` 7292 (eval echo "\"\$as_me:7 292: $lt_compile\"" >&5)7607 (eval echo "\"\$as_me:7607: $lt_compile\"" >&5) 7293 7608 (eval "$lt_compile" 2>conftest.err) 7294 7609 ac_status=$? 7295 7610 cat conftest.err >&5 7296 echo "$as_me:7 296: \$? = $ac_status" >&57611 echo "$as_me:7611: \$? = $ac_status" >&5 7297 7612 if (exit $ac_status) && test -s "$ac_outfile"; then 7298 7613 # The compiler can only warn and ignore the option if not recognized … … 7564 7879 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 7565 7880 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } 7566 if test "${lt_ prog_compiler_pic_works+set}" = set; then7881 if test "${lt_cv_prog_compiler_pic_works+set}" = set; then 7567 7882 echo $ECHO_N "(cached) $ECHO_C" >&6 7568 7883 else 7569 lt_ prog_compiler_pic_works=no7884 lt_cv_prog_compiler_pic_works=no 7570 7885 ac_outfile=conftest.$ac_objext 7571 7886 echo "$lt_simple_compile_test_code" > conftest.$ac_ext … … 7580 7895 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7581 7896 -e 's:$: $lt_compiler_flag:'` 7582 (eval echo "\"\$as_me:7 582: $lt_compile\"" >&5)7897 (eval echo "\"\$as_me:7897: $lt_compile\"" >&5) 7583 7898 (eval "$lt_compile" 2>conftest.err) 7584 7899 ac_status=$? 7585 7900 cat conftest.err >&5 7586 echo "$as_me:7 586: \$? = $ac_status" >&57901 echo "$as_me:7901: \$? = $ac_status" >&5 7587 7902 if (exit $ac_status) && test -s "$ac_outfile"; then 7588 7903 # The compiler can only warn and ignore the option if not recognized … … 7591 7906 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 7592 7907 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 7593 lt_ prog_compiler_pic_works=yes7908 lt_cv_prog_compiler_pic_works=yes 7594 7909 fi 7595 7910 fi … … 7597 7912 7598 7913 fi 7599 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_pic_works" >&57600 echo "${ECHO_T}$lt_ prog_compiler_pic_works" >&6; }7601 7602 if test x"$lt_ prog_compiler_pic_works" = xyes; then7914 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 7915 echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } 7916 7917 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then 7603 7918 case $lt_prog_compiler_pic in 7604 7919 "" | " "*) ;; … … 7627 7942 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 7628 7943 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 7629 if test "${lt_ prog_compiler_static_works+set}" = set; then7944 if test "${lt_cv_prog_compiler_static_works+set}" = set; then 7630 7945 echo $ECHO_N "(cached) $ECHO_C" >&6 7631 7946 else 7632 lt_ prog_compiler_static_works=no7947 lt_cv_prog_compiler_static_works=no 7633 7948 save_LDFLAGS="$LDFLAGS" 7634 7949 LDFLAGS="$LDFLAGS $lt_tmp_static_flag" … … 7643 7958 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 7644 7959 if diff conftest.exp conftest.er2 >/dev/null; then 7645 lt_ prog_compiler_static_works=yes7960 lt_cv_prog_compiler_static_works=yes 7646 7961 fi 7647 7962 else 7648 lt_ prog_compiler_static_works=yes7963 lt_cv_prog_compiler_static_works=yes 7649 7964 fi 7650 7965 fi 7651 $rm conftest*7966 $rm -r conftest* 7652 7967 LDFLAGS="$save_LDFLAGS" 7653 7968 7654 7969 fi 7655 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_static_works" >&57656 echo "${ECHO_T}$lt_ prog_compiler_static_works" >&6; }7657 7658 if test x"$lt_ prog_compiler_static_works" = xyes; then7970 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 7971 echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } 7972 7973 if test x"$lt_cv_prog_compiler_static_works" = xyes; then 7659 7974 : 7660 7975 else … … 7684 7999 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7685 8000 -e 's:$: $lt_compiler_flag:'` 7686 (eval echo "\"\$as_me: 7686: $lt_compile\"" >&5)8001 (eval echo "\"\$as_me:8001: $lt_compile\"" >&5) 7687 8002 (eval "$lt_compile" 2>out/conftest.err) 7688 8003 ac_status=$? 7689 8004 cat out/conftest.err >&5 7690 echo "$as_me: 7690: \$? = $ac_status" >&58005 echo "$as_me:8005: \$? = $ac_status" >&5 7691 8006 if (exit $ac_status) && test -s out/conftest2.$ac_objext 7692 8007 then … … 7768 8083 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 7769 8084 # as well as any symbol that contains `d'. 7770 exclude_expsyms= "_GLOBAL_OFFSET_TABLE_"8085 exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 7771 8086 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 7772 8087 # platforms (ab)use it in PIC code, but their linkers get confused if … … 7774 8089 # rely on this symbol name, it's probably fine to never include it in 7775 8090 # preloaded symbol tables. 8091 # Exclude shared library initialization/finalization symbols. 7776 8092 extract_expsyms_cmds= 7777 8093 # Just being paranoid about ensuring that cc_basename is set. … … 7832 8148 # See if GNU ld supports shared libraries. 7833 8149 case $host_os in 7834 aix 3* | aix4* | aix5*)8150 aix[3-9]*) 7835 8151 # On AIX/PPC, the GNU linker is very broken 7836 8152 if test "$host_cpu" != ia64; then … … 8052 8368 ;; 8053 8369 8054 aix 4* | aix5*)8370 aix[4-9]*) 8055 8371 if test "$host_cpu" = ia64; then 8056 8372 # On IA64, the linker does run time linking by default, so we don't … … 8072 8388 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 8073 8389 # need to do runtime linking. 8074 case $host_os in aix4.[23]|aix4.[23].*|aix 5*)8390 case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 8075 8391 for ld_flag in $LDFLAGS; do 8076 8392 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then … … 8344 8660 if test "$GCC" = yes ; then 8345 8661 output_verbose_link_cmd='echo' 8346 archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 8347 module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 8348 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 8349 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}' 8350 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}' 8662 archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 8663 module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 8664 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}" 8665 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}" 8351 8666 else 8352 8667 case $cc_basename in … … 8868 9183 ;; 8869 9184 8870 aix 4* | aix5*)9185 aix[4-9]*) 8871 9186 version_type=linux 8872 9187 need_lib_prefix=no … … 9402 9717 test "$dynamic_linker" = no && can_build_shared=no 9403 9718 9719 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 9720 echo $ECHO_N "(cached) $ECHO_C" >&6 9721 else 9722 lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 9723 fi 9724 9725 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 9726 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 9727 echo $ECHO_N "(cached) $ECHO_C" >&6 9728 else 9729 lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 9730 fi 9731 9732 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 9733 9404 9734 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 9405 9735 if test "$GCC" = yes; then … … 9721 10051 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } 9722 10052 if test $ac_cv_lib_dld_shl_load = yes; then 9723 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="- dld"10053 lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" 9724 10054 else 9725 10055 { echo "$as_me:$LINENO: checking for dlopen" >&5 … … 9997 10327 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } 9998 10328 if test $ac_cv_lib_dld_dld_link = yes; then 9999 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="- dld"10329 lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" 10000 10330 fi 10001 10331 … … 10046 10376 lt_status=$lt_dlunknown 10047 10377 cat > conftest.$ac_ext <<EOF 10048 #line 10 048 "configure"10378 #line 10378 "configure" 10049 10379 #include "confdefs.h" 10050 10380 … … 10146 10476 lt_status=$lt_dlunknown 10147 10477 cat > conftest.$ac_ext <<EOF 10148 #line 10 148 "configure"10478 #line 10478 "configure" 10149 10479 #include "confdefs.h" 10150 10480 … … 10273 10603 ;; 10274 10604 10275 aix 4* | aix5*)10605 aix[4-9]*) 10276 10606 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 10277 10607 test "$enable_shared" = yes && enable_static=no … … 10329 10659 postdeps \ 10330 10660 compiler_lib_search_path \ 10661 compiler_lib_search_dirs \ 10331 10662 archive_cmds \ 10332 10663 archive_expsym_cmds \ … … 10389 10720 # NOTE: Changes made to this file will be lost: look at ltmain.sh. 10390 10721 # 10391 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 10722 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 10392 10723 # Free Software Foundation, Inc. 10393 10724 # … … 10625 10956 postdeps=$lt_postdeps 10626 10957 10958 # The directories searched by this compiler when creating a shared 10959 # library 10960 compiler_lib_search_dirs=$lt_compiler_lib_search_dirs 10961 10627 10962 # The library search path used internally by the compiler when linking 10628 10963 # a shared library. … … 10873 11208 postdeps_CXX= 10874 11209 compiler_lib_search_path_CXX= 11210 compiler_lib_search_dirs_CXX= 10875 11211 10876 11212 # Source file extension for C++ test sources. … … 10910 11246 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 10911 11247 _lt_linker_boilerplate=`cat conftest.err` 10912 $rm conftest*11248 $rm -r conftest* 10913 11249 10914 11250 … … 11117 11453 ld_shlibs_CXX=no 11118 11454 ;; 11119 aix 4* | aix5*)11455 aix[4-9]*) 11120 11456 if test "$host_cpu" = ia64; then 11121 11457 # On IA64, the linker does run time linking by default, so we don't … … 11130 11466 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 11131 11467 # need to do runtime linking. 11132 case $host_os in aix4.[23]|aix4.[23].*|aix 5*)11468 case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 11133 11469 for ld_flag in $LDFLAGS; do 11134 11470 case $ld_flag in … … 11388 11724 ;; 11389 11725 darwin* | rhapsody*) 11390 case $host_os in11391 rhapsody* | darwin1.[012])11392 allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'11393 ;;11394 *) # Darwin 1.3 on11395 if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then11396 allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'11397 else11398 case ${MACOSX_DEPLOYMENT_TARGET} in11399 10.[012])11400 allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'11401 ;;11402 10.*)11403 allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'11404 ;;11405 esac11406 fi11407 ;;11408 esac11409 11726 archive_cmds_need_lc_CXX=no 11410 11727 hardcode_direct_CXX=no … … 11413 11730 whole_archive_flag_spec_CXX='' 11414 11731 link_all_deplibs_CXX=yes 11415 11416 if test "$GXX" = yes ; then 11417 lt_int_apple_cc_single_mod=no 11732 allow_undefined_flag_CXX="$_lt_dar_allow_undefined" 11733 if test "$GXX" = yes ; then 11418 11734 output_verbose_link_cmd='echo' 11419 if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then 11420 lt_int_apple_cc_single_mod=yes 11735 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}" 11736 module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 11737 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}" 11738 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}" 11739 if test "$lt_cv_apple_cc_single_mod" != "yes"; then 11740 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}" 11741 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}" 11421 11742 fi 11422 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then11423 archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'11424 else11425 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'11426 fi11427 module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'11428 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds11429 if test "X$lt_int_apple_cc_single_mod" = Xyes ; then11430 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}'11431 else11432 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}'11433 fi11434 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}'11435 11743 else 11436 11744 case $cc_basename in … … 11683 11991 whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' 11684 11992 ;; 11685 pgCC* )11993 pgCC* | pgcpp*) 11686 11994 # Portland Group C++ compiler 11687 11995 archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' … … 12090 12398 LD_CXX="$LD" 12091 12399 12092 12093 12400 cat > conftest.$ac_ext <<EOF 12094 12401 class Foo … … 12192 12499 $rm -f confest.$objext 12193 12500 12501 compiler_lib_search_dirs_CXX= 12502 if test -n "$compiler_lib_search_path_CXX"; then 12503 compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` 12504 fi 12505 12194 12506 # PORTME: override above test on systems where it is broken 12195 12507 case $host_os in … … 12247 12559 esac 12248 12560 12249 12250 12561 case " $postdeps_CXX " in 12251 12562 *" -lc "*) archive_cmds_need_lc_CXX=no ;; … … 12323 12634 else 12324 12635 case $host_os in 12325 aix 4* | aix5*)12636 aix[4-9]*) 12326 12637 # All AIX code is PIC. 12327 12638 if test "$host_cpu" = ia64; then … … 12419 12730 lt_prog_compiler_static_CXX='-static' 12420 12731 ;; 12421 pgCC* )12732 pgCC* | pgcpp*) 12422 12733 # Portland Group C++ compiler. 12423 12734 lt_prog_compiler_wl_CXX='-Wl,' … … 12550 12861 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 12551 12862 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } 12552 if test "${lt_ prog_compiler_pic_works_CXX+set}" = set; then12863 if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then 12553 12864 echo $ECHO_N "(cached) $ECHO_C" >&6 12554 12865 else 12555 lt_ prog_compiler_pic_works_CXX=no12866 lt_cv_prog_compiler_pic_works_CXX=no 12556 12867 ac_outfile=conftest.$ac_objext 12557 12868 echo "$lt_simple_compile_test_code" > conftest.$ac_ext … … 12566 12877 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12567 12878 -e 's:$: $lt_compiler_flag:'` 12568 (eval echo "\"\$as_me:12 568: $lt_compile\"" >&5)12879 (eval echo "\"\$as_me:12879: $lt_compile\"" >&5) 12569 12880 (eval "$lt_compile" 2>conftest.err) 12570 12881 ac_status=$? 12571 12882 cat conftest.err >&5 12572 echo "$as_me:12 572: \$? = $ac_status" >&512883 echo "$as_me:12883: \$? = $ac_status" >&5 12573 12884 if (exit $ac_status) && test -s "$ac_outfile"; then 12574 12885 # The compiler can only warn and ignore the option if not recognized … … 12577 12888 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 12578 12889 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 12579 lt_ prog_compiler_pic_works_CXX=yes12890 lt_cv_prog_compiler_pic_works_CXX=yes 12580 12891 fi 12581 12892 fi … … 12583 12894 12584 12895 fi 12585 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_pic_works_CXX" >&512586 echo "${ECHO_T}$lt_ prog_compiler_pic_works_CXX" >&6; }12587 12588 if test x"$lt_ prog_compiler_pic_works_CXX" = xyes; then12896 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 12897 echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } 12898 12899 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then 12589 12900 case $lt_prog_compiler_pic_CXX in 12590 12901 "" | " "*) ;; … … 12613 12924 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 12614 12925 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 12615 if test "${lt_ prog_compiler_static_works_CXX+set}" = set; then12926 if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then 12616 12927 echo $ECHO_N "(cached) $ECHO_C" >&6 12617 12928 else 12618 lt_ prog_compiler_static_works_CXX=no12929 lt_cv_prog_compiler_static_works_CXX=no 12619 12930 save_LDFLAGS="$LDFLAGS" 12620 12931 LDFLAGS="$LDFLAGS $lt_tmp_static_flag" … … 12629 12940 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 12630 12941 if diff conftest.exp conftest.er2 >/dev/null; then 12631 lt_ prog_compiler_static_works_CXX=yes12942 lt_cv_prog_compiler_static_works_CXX=yes 12632 12943 fi 12633 12944 else 12634 lt_ prog_compiler_static_works_CXX=yes12945 lt_cv_prog_compiler_static_works_CXX=yes 12635 12946 fi 12636 12947 fi 12637 $rm conftest*12948 $rm -r conftest* 12638 12949 LDFLAGS="$save_LDFLAGS" 12639 12950 12640 12951 fi 12641 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_static_works_CXX" >&512642 echo "${ECHO_T}$lt_ prog_compiler_static_works_CXX" >&6; }12643 12644 if test x"$lt_ prog_compiler_static_works_CXX" = xyes; then12952 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 12953 echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } 12954 12955 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then 12645 12956 : 12646 12957 else … … 12670 12981 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 12671 12982 -e 's:$: $lt_compiler_flag:'` 12672 (eval echo "\"\$as_me:12 672: $lt_compile\"" >&5)12983 (eval echo "\"\$as_me:12983: $lt_compile\"" >&5) 12673 12984 (eval "$lt_compile" 2>out/conftest.err) 12674 12985 ac_status=$? 12675 12986 cat out/conftest.err >&5 12676 echo "$as_me:12 676: \$? = $ac_status" >&512987 echo "$as_me:12987: \$? = $ac_status" >&5 12677 12988 if (exit $ac_status) && test -s out/conftest2.$ac_objext 12678 12989 then … … 12727 13038 export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' 12728 13039 case $host_os in 12729 aix 4* | aix5*)13040 aix[4-9]*) 12730 13041 # If we're using GNU nm, then we don't want the "-C" option. 12731 13042 # -C means demangle to AIX nm, but means don't demangle with GNU nm … … 12749 13060 ;; 12750 13061 esac 13062 exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 12751 13063 12752 13064 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 … … 12850 13162 ;; 12851 13163 12852 aix 4* | aix5*)13164 aix[4-9]*) 12853 13165 version_type=linux 12854 13166 need_lib_prefix=no … … 13383 13695 test "$dynamic_linker" = no && can_build_shared=no 13384 13696 13697 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 13698 echo $ECHO_N "(cached) $ECHO_C" >&6 13699 else 13700 lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 13701 fi 13702 13703 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 13704 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 13705 echo $ECHO_N "(cached) $ECHO_C" >&6 13706 else 13707 lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 13708 fi 13709 13710 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 13711 13385 13712 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 13386 13713 if test "$GCC" = yes; then … … 13466 13793 postdeps_CXX \ 13467 13794 compiler_lib_search_path_CXX \ 13795 compiler_lib_search_dirs_CXX \ 13468 13796 archive_cmds_CXX \ 13469 13797 archive_expsym_cmds_CXX \ … … 13714 14042 postdeps=$lt_postdeps_CXX 13715 14043 14044 # The directories searched by this compiler when creating a shared 14045 # library 14046 compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX 14047 13716 14048 # The library search path used internally by the compiler when linking 13717 14049 # a shared library. … … 13928 14260 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 13929 14261 _lt_linker_boilerplate=`cat conftest.err` 13930 $rm conftest*14262 $rm -r conftest* 13931 14263 13932 14264 … … 13966 14298 fi 13967 14299 ;; 13968 aix 4* | aix5*)14300 aix[4-9]*) 13969 14301 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then 13970 14302 test "$enable_shared" = yes && enable_static=no … … 14231 14563 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 14232 14564 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } 14233 if test "${lt_ prog_compiler_pic_works_F77+set}" = set; then14565 if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then 14234 14566 echo $ECHO_N "(cached) $ECHO_C" >&6 14235 14567 else 14236 lt_ prog_compiler_pic_works_F77=no14568 lt_cv_prog_compiler_pic_works_F77=no 14237 14569 ac_outfile=conftest.$ac_objext 14238 14570 echo "$lt_simple_compile_test_code" > conftest.$ac_ext … … 14247 14579 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14248 14580 -e 's:$: $lt_compiler_flag:'` 14249 (eval echo "\"\$as_me:14 249: $lt_compile\"" >&5)14581 (eval echo "\"\$as_me:14581: $lt_compile\"" >&5) 14250 14582 (eval "$lt_compile" 2>conftest.err) 14251 14583 ac_status=$? 14252 14584 cat conftest.err >&5 14253 echo "$as_me:14 253: \$? = $ac_status" >&514585 echo "$as_me:14585: \$? = $ac_status" >&5 14254 14586 if (exit $ac_status) && test -s "$ac_outfile"; then 14255 14587 # The compiler can only warn and ignore the option if not recognized … … 14258 14590 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 14259 14591 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 14260 lt_ prog_compiler_pic_works_F77=yes14592 lt_cv_prog_compiler_pic_works_F77=yes 14261 14593 fi 14262 14594 fi … … 14264 14596 14265 14597 fi 14266 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_pic_works_F77" >&514267 echo "${ECHO_T}$lt_ prog_compiler_pic_works_F77" >&6; }14268 14269 if test x"$lt_ prog_compiler_pic_works_F77" = xyes; then14598 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 14599 echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } 14600 14601 if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then 14270 14602 case $lt_prog_compiler_pic_F77 in 14271 14603 "" | " "*) ;; … … 14294 14626 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 14295 14627 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 14296 if test "${lt_ prog_compiler_static_works_F77+set}" = set; then14628 if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then 14297 14629 echo $ECHO_N "(cached) $ECHO_C" >&6 14298 14630 else 14299 lt_ prog_compiler_static_works_F77=no14631 lt_cv_prog_compiler_static_works_F77=no 14300 14632 save_LDFLAGS="$LDFLAGS" 14301 14633 LDFLAGS="$LDFLAGS $lt_tmp_static_flag" … … 14310 14642 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 14311 14643 if diff conftest.exp conftest.er2 >/dev/null; then 14312 lt_ prog_compiler_static_works_F77=yes14644 lt_cv_prog_compiler_static_works_F77=yes 14313 14645 fi 14314 14646 else 14315 lt_ prog_compiler_static_works_F77=yes14647 lt_cv_prog_compiler_static_works_F77=yes 14316 14648 fi 14317 14649 fi 14318 $rm conftest*14650 $rm -r conftest* 14319 14651 LDFLAGS="$save_LDFLAGS" 14320 14652 14321 14653 fi 14322 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_static_works_F77" >&514323 echo "${ECHO_T}$lt_ prog_compiler_static_works_F77" >&6; }14324 14325 if test x"$lt_ prog_compiler_static_works_F77" = xyes; then14654 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 14655 echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } 14656 14657 if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then 14326 14658 : 14327 14659 else … … 14351 14683 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14352 14684 -e 's:$: $lt_compiler_flag:'` 14353 (eval echo "\"\$as_me:14 353: $lt_compile\"" >&5)14685 (eval echo "\"\$as_me:14685: $lt_compile\"" >&5) 14354 14686 (eval "$lt_compile" 2>out/conftest.err) 14355 14687 ac_status=$? 14356 14688 cat out/conftest.err >&5 14357 echo "$as_me:14 357: \$? = $ac_status" >&514689 echo "$as_me:14689: \$? = $ac_status" >&5 14358 14690 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14359 14691 then … … 14435 14767 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 14436 14768 # as well as any symbol that contains `d'. 14437 exclude_expsyms_F77= "_GLOBAL_OFFSET_TABLE_"14769 exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 14438 14770 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 14439 14771 # platforms (ab)use it in PIC code, but their linkers get confused if … … 14441 14773 # rely on this symbol name, it's probably fine to never include it in 14442 14774 # preloaded symbol tables. 14775 # Exclude shared library initialization/finalization symbols. 14443 14776 extract_expsyms_cmds= 14444 14777 # Just being paranoid about ensuring that cc_basename is set. … … 14499 14832 # See if GNU ld supports shared libraries. 14500 14833 case $host_os in 14501 aix 3* | aix4* | aix5*)14834 aix[3-9]*) 14502 14835 # On AIX/PPC, the GNU linker is very broken 14503 14836 if test "$host_cpu" != ia64; then … … 14719 15052 ;; 14720 15053 14721 aix 4* | aix5*)15054 aix[4-9]*) 14722 15055 if test "$host_cpu" = ia64; then 14723 15056 # On IA64, the linker does run time linking by default, so we don't … … 14739 15072 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 14740 15073 # need to do runtime linking. 14741 case $host_os in aix4.[23]|aix4.[23].*|aix 5*)15074 case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 14742 15075 for ld_flag in $LDFLAGS; do 14743 15076 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then … … 14991 15324 if test "$GCC" = yes ; then 14992 15325 output_verbose_link_cmd='echo' 14993 archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 14994 module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 14995 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 14996 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}' 14997 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}' 15326 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}" 15327 module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 15328 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}" 15329 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}" 14998 15330 else 14999 15331 case $cc_basename in … … 15464 15796 ;; 15465 15797 15466 aix 4* | aix5*)15798 aix[4-9]*) 15467 15799 version_type=linux 15468 15800 need_lib_prefix=no … … 15997 16329 test "$dynamic_linker" = no && can_build_shared=no 15998 16330 16331 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 16332 echo $ECHO_N "(cached) $ECHO_C" >&6 16333 else 16334 lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 16335 fi 16336 16337 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 16338 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 16339 echo $ECHO_N "(cached) $ECHO_C" >&6 16340 else 16341 lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 16342 fi 16343 16344 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 16345 15999 16346 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 16000 16347 if test "$GCC" = yes; then … … 16080 16427 postdeps_F77 \ 16081 16428 compiler_lib_search_path_F77 \ 16429 compiler_lib_search_dirs_F77 \ 16082 16430 archive_cmds_F77 \ 16083 16431 archive_expsym_cmds_F77 \ … … 16328 16676 postdeps=$lt_postdeps_F77 16329 16677 16678 # The directories searched by this compiler when creating a shared 16679 # library 16680 compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77 16681 16330 16682 # The library search path used internally by the compiler when linking 16331 16683 # a shared library. … … 16502 16854 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 16503 16855 _lt_linker_boilerplate=`cat conftest.err` 16504 $rm conftest*16856 $rm -r conftest* 16505 16857 16506 16858 … … 16551 16903 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16552 16904 -e 's:$: $lt_compiler_flag:'` 16553 (eval echo "\"\$as_me:16 553: $lt_compile\"" >&5)16905 (eval echo "\"\$as_me:16905: $lt_compile\"" >&5) 16554 16906 (eval "$lt_compile" 2>conftest.err) 16555 16907 ac_status=$? 16556 16908 cat conftest.err >&5 16557 echo "$as_me:16 557: \$? = $ac_status" >&516909 echo "$as_me:16909: \$? = $ac_status" >&5 16558 16910 if (exit $ac_status) && test -s "$ac_outfile"; then 16559 16911 # The compiler can only warn and ignore the option if not recognized … … 16615 16967 # Although the cygwin gcc ignores -fPIC, still need this for old-style 16616 16968 # (--disable-auto-import) libraries 16617 lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' 16969 16618 16970 ;; 16619 16971 … … 16685 17037 # This hack is so that the source file can tell whether it is being 16686 17038 # built for inclusion in a dll (and should export symbols for example). 16687 lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' 17039 16688 17040 ;; 16689 17041 … … 16825 17177 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 16826 17178 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } 16827 if test "${lt_ prog_compiler_pic_works_GCJ+set}" = set; then17179 if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then 16828 17180 echo $ECHO_N "(cached) $ECHO_C" >&6 16829 17181 else 16830 lt_ prog_compiler_pic_works_GCJ=no17182 lt_cv_prog_compiler_pic_works_GCJ=no 16831 17183 ac_outfile=conftest.$ac_objext 16832 17184 echo "$lt_simple_compile_test_code" > conftest.$ac_ext … … 16841 17193 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16842 17194 -e 's:$: $lt_compiler_flag:'` 16843 (eval echo "\"\$as_me:1 6843: $lt_compile\"" >&5)17195 (eval echo "\"\$as_me:17195: $lt_compile\"" >&5) 16844 17196 (eval "$lt_compile" 2>conftest.err) 16845 17197 ac_status=$? 16846 17198 cat conftest.err >&5 16847 echo "$as_me:1 6847: \$? = $ac_status" >&517199 echo "$as_me:17199: \$? = $ac_status" >&5 16848 17200 if (exit $ac_status) && test -s "$ac_outfile"; then 16849 17201 # The compiler can only warn and ignore the option if not recognized … … 16852 17204 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 16853 17205 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then 16854 lt_ prog_compiler_pic_works_GCJ=yes17206 lt_cv_prog_compiler_pic_works_GCJ=yes 16855 17207 fi 16856 17208 fi … … 16858 17210 16859 17211 fi 16860 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_pic_works_GCJ" >&516861 echo "${ECHO_T}$lt_ prog_compiler_pic_works_GCJ" >&6; }16862 16863 if test x"$lt_ prog_compiler_pic_works_GCJ" = xyes; then17212 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 17213 echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } 17214 17215 if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then 16864 17216 case $lt_prog_compiler_pic_GCJ in 16865 17217 "" | " "*) ;; … … 16888 17240 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 16889 17241 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } 16890 if test "${lt_ prog_compiler_static_works_GCJ+set}" = set; then17242 if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then 16891 17243 echo $ECHO_N "(cached) $ECHO_C" >&6 16892 17244 else 16893 lt_ prog_compiler_static_works_GCJ=no17245 lt_cv_prog_compiler_static_works_GCJ=no 16894 17246 save_LDFLAGS="$LDFLAGS" 16895 17247 LDFLAGS="$LDFLAGS $lt_tmp_static_flag" … … 16904 17256 $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 16905 17257 if diff conftest.exp conftest.er2 >/dev/null; then 16906 lt_ prog_compiler_static_works_GCJ=yes17258 lt_cv_prog_compiler_static_works_GCJ=yes 16907 17259 fi 16908 17260 else 16909 lt_ prog_compiler_static_works_GCJ=yes17261 lt_cv_prog_compiler_static_works_GCJ=yes 16910 17262 fi 16911 17263 fi 16912 $rm conftest*17264 $rm -r conftest* 16913 17265 LDFLAGS="$save_LDFLAGS" 16914 17266 16915 17267 fi 16916 { echo "$as_me:$LINENO: result: $lt_ prog_compiler_static_works_GCJ" >&516917 echo "${ECHO_T}$lt_ prog_compiler_static_works_GCJ" >&6; }16918 16919 if test x"$lt_ prog_compiler_static_works_GCJ" = xyes; then17268 { echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 17269 echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } 17270 17271 if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then 16920 17272 : 16921 17273 else … … 16945 17297 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16946 17298 -e 's:$: $lt_compiler_flag:'` 16947 (eval echo "\"\$as_me:1 6947: $lt_compile\"" >&5)17299 (eval echo "\"\$as_me:17299: $lt_compile\"" >&5) 16948 17300 (eval "$lt_compile" 2>out/conftest.err) 16949 17301 ac_status=$? 16950 17302 cat out/conftest.err >&5 16951 echo "$as_me:1 6951: \$? = $ac_status" >&517303 echo "$as_me:17303: \$? = $ac_status" >&5 16952 17304 if (exit $ac_status) && test -s out/conftest2.$ac_objext 16953 17305 then … … 17029 17381 # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', 17030 17382 # as well as any symbol that contains `d'. 17031 exclude_expsyms_GCJ= "_GLOBAL_OFFSET_TABLE_"17383 exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' 17032 17384 # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out 17033 17385 # platforms (ab)use it in PIC code, but their linkers get confused if … … 17035 17387 # rely on this symbol name, it's probably fine to never include it in 17036 17388 # preloaded symbol tables. 17389 # Exclude shared library initialization/finalization symbols. 17037 17390 extract_expsyms_cmds= 17038 17391 # Just being paranoid about ensuring that cc_basename is set. … … 17093 17446 # See if GNU ld supports shared libraries. 17094 17447 case $host_os in 17095 aix 3* | aix4* | aix5*)17448 aix[3-9]*) 17096 17449 # On AIX/PPC, the GNU linker is very broken 17097 17450 if test "$host_cpu" != ia64; then … … 17313 17666 ;; 17314 17667 17315 aix 4* | aix5*)17668 aix[4-9]*) 17316 17669 if test "$host_cpu" = ia64; then 17317 17670 # On IA64, the linker does run time linking by default, so we don't … … 17333 17686 # AIX style linking. If -brtl is somewhere in LDFLAGS, we 17334 17687 # need to do runtime linking. 17335 case $host_os in aix4.[23]|aix4.[23].*|aix 5*)17688 case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) 17336 17689 for ld_flag in $LDFLAGS; do 17337 17690 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then … … 17605 17958 if test "$GCC" = yes ; then 17606 17959 output_verbose_link_cmd='echo' 17607 archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' 17608 module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' 17609 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds 17610 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}' 17611 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}' 17960 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}" 17961 module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 17962 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}" 17963 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}" 17612 17964 else 17613 17965 case $cc_basename in … … 18078 18430 ;; 18079 18431 18080 aix 4* | aix5*)18432 aix[4-9]*) 18081 18433 version_type=linux 18082 18434 need_lib_prefix=no … … 18611 18963 test "$dynamic_linker" = no && can_build_shared=no 18612 18964 18965 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 18966 echo $ECHO_N "(cached) $ECHO_C" >&6 18967 else 18968 lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 18969 fi 18970 18971 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 18972 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 18973 echo $ECHO_N "(cached) $ECHO_C" >&6 18974 else 18975 lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 18976 fi 18977 18978 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 18979 18613 18980 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 18614 18981 if test "$GCC" = yes; then … … 18694 19061 postdeps_GCJ \ 18695 19062 compiler_lib_search_path_GCJ \ 19063 compiler_lib_search_dirs_GCJ \ 18696 19064 archive_cmds_GCJ \ 18697 19065 archive_expsym_cmds_GCJ \ … … 18942 19310 postdeps=$lt_postdeps_GCJ 18943 19311 19312 # The directories searched by this compiler when creating a shared 19313 # library 19314 compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ 19315 18944 19316 # The library search path used internally by the compiler when linking 18945 19317 # a shared library. … … 19115 19487 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err 19116 19488 _lt_linker_boilerplate=`cat conftest.err` 19117 $rm conftest*19489 $rm -r conftest* 19118 19490 19119 19491 … … 19175 19547 postdeps_RC \ 19176 19548 compiler_lib_search_path_RC \ 19549 compiler_lib_search_dirs_RC \ 19177 19550 archive_cmds_RC \ 19178 19551 archive_expsym_cmds_RC \ … … 19422 19795 # shared library. 19423 19796 postdeps=$lt_postdeps_RC 19797 19798 # The directories searched by this compiler when creating a shared 19799 # library 19800 compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC 19424 19801 19425 19802 # The library search path used internally by the compiler when linking … … 20234 20611 20235 20612 20236 MIN_TLS_VERSION=2. 2.120237 20238 # Check whether --with-libgnutls- extra-prefix was given.20239 if test "${with_libgnutls_ extra_prefix+set}" = set; then20240 withval=$with_libgnutls_ extra_prefix; libgnutls_extra_config_prefix="$withval"20241 else 20242 libgnutls_ extra_config_prefix=""20243 fi 20244 20245 20246 if test x$libgnutls_ extra_config_prefix != x ; then20247 if test x${LIBGNUTLS_ EXTRA_CONFIG+set} != xset ; then20248 LIBGNUTLS_ EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config20613 MIN_TLS_VERSION=2.4.0 20614 20615 # Check whether --with-libgnutls-prefix was given. 20616 if test "${with_libgnutls_prefix+set}" = set; then 20617 withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval" 20618 else 20619 libgnutls_config_prefix="" 20620 fi 20621 20622 20623 if test x$libgnutls_config_prefix != x ; then 20624 if test x${LIBGNUTLS_CONFIG+set} != xset ; then 20625 LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config 20249 20626 fi 20250 20627 fi 20251 20628 20252 # Extract the first word of "libgnutls- extra-config", so it can be a program name with args.20253 set dummy libgnutls- extra-config; ac_word=$220629 # Extract the first word of "libgnutls-config", so it can be a program name with args. 20630 set dummy libgnutls-config; ac_word=$2 20254 20631 { echo "$as_me:$LINENO: checking for $ac_word" >&5 20255 20632 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 20256 if test "${ac_cv_path_LIBGNUTLS_ EXTRA_CONFIG+set}" = set; then20633 if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then 20257 20634 echo $ECHO_N "(cached) $ECHO_C" >&6 20258 20635 else 20259 case $LIBGNUTLS_ EXTRA_CONFIG in20636 case $LIBGNUTLS_CONFIG in 20260 20637 [\\/]* | ?:[\\/]*) 20261 ac_cv_path_LIBGNUTLS_ EXTRA_CONFIG="$LIBGNUTLS_EXTRA_CONFIG" # Let the user override the test with a path.20638 ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path. 20262 20639 ;; 20263 20640 *) … … 20269 20646 for ac_exec_ext in '' $ac_executable_extensions; do 20270 20647 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 20271 ac_cv_path_LIBGNUTLS_ EXTRA_CONFIG="$as_dir/$ac_word$ac_exec_ext"20648 ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext" 20272 20649 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 20273 20650 break 2 … … 20277 20654 IFS=$as_save_IFS 20278 20655 20279 test -z "$ac_cv_path_LIBGNUTLS_ EXTRA_CONFIG" && ac_cv_path_LIBGNUTLS_EXTRA_CONFIG="no"20656 test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no" 20280 20657 ;; 20281 20658 esac 20282 20659 fi 20283 LIBGNUTLS_ EXTRA_CONFIG=$ac_cv_path_LIBGNUTLS_EXTRA_CONFIG20284 if test -n "$LIBGNUTLS_ EXTRA_CONFIG"; then20285 { echo "$as_me:$LINENO: result: $LIBGNUTLS_ EXTRA_CONFIG" >&520286 echo "${ECHO_T}$LIBGNUTLS_ EXTRA_CONFIG" >&6; }20660 LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG 20661 if test -n "$LIBGNUTLS_CONFIG"; then 20662 { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5 20663 echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; } 20287 20664 else 20288 20665 { echo "$as_me:$LINENO: result: no" >&5 … … 20295 20672 echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; } 20296 20673 no_libgnutls="" 20297 if test "$LIBGNUTLS_ EXTRA_CONFIG" = "no" ; then20674 if test "$LIBGNUTLS_CONFIG" = "no" ; then 20298 20675 no_libgnutls=yes 20299 20676 else 20300 LIBGNUTLS_ EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags`20301 LIBGNUTLS_ EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs`20302 libgnutls_ extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`20677 LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` 20678 LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` 20679 libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` 20303 20680 20304 20681 20305 20682 ac_save_CFLAGS="$CFLAGS" 20306 20683 ac_save_LIBS="$LIBS" 20307 CFLAGS="$CFLAGS $LIBGNUTLS_ EXTRA_CFLAGS"20308 LIBS="$LIBS $LIBGNUTLS_ EXTRA_LIBS"20684 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" 20685 LIBS="$LIBS $LIBGNUTLS_LIBS" 20309 20686 rm -f conf.libgnutlstest 20310 20687 if test "$cross_compiling" = yes; then … … 20321 20698 #include <stdlib.h> 20322 20699 #include <string.h> 20323 #include <gnutls/ extra.h>20700 #include <gnutls/gnutls.h> 20324 20701 20325 20702 int … … 20328 20705 system ("touch conf.libgnutlstest"); 20329 20706 20330 if( strcmp( gnutls_ extra_check_version(NULL), "$libgnutls_extra_config_version" ) )20707 if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) ) 20331 20708 { 20332 printf("\n*** 'libgnutls- extra-config --version' returned %s, but LIBGNUTLS_EXTRA(%s)\n",20333 "$libgnutls_ extra_config_version", gnutls_extra_check_version(NULL) );20334 printf("*** was found! If libgnutls- extra-config was correct, then it is best\n");20335 printf("*** to remove the old version of LIBGNUTLS _EXTRA. You may also be able to fix the error\n");20709 printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n", 20710 "$libgnutls_config_version", gnutls_check_version(NULL) ); 20711 printf("*** was found! If libgnutls-config was correct, then it is best\n"); 20712 printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n"); 20336 20713 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 20337 20714 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 20338 20715 printf("*** required on your system.\n"); 20339 printf("*** If libgnutls- extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n");20340 printf("*** to point to the correct copy of libgnutls- extra-config, and remove the file config.cache\n");20716 printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n"); 20717 printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n"); 20341 20718 printf("*** before re-running configure\n"); 20342 20719 } 20343 else if ( strcmp(gnutls_ extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) )20720 else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) ) 20344 20721 { 20345 printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION); 20346 printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) ); 20347 printf("*** and gnutls-extra.\n"); 20722 printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION); 20723 printf("*** library (version %s)\n", gnutls_check_version(NULL) ); 20348 20724 } 20349 20725 else 20350 20726 { 20351 if ( gnutls_ extra_check_version( "$min_libgnutls_version" ) )20727 if ( gnutls_check_version( "$min_libgnutls_version" ) ) 20352 20728 { 20353 20729 return 0; … … 20355 20731 else 20356 20732 { 20357 printf("no\n*** An old version of LIBGNUTLS _EXTRA(%s) was found.\n",20358 gnutls_ extra_check_version(NULL) );20359 printf("*** You need a version of LIBGNUTLS _EXTRAnewer than %s. The latest version of\n",20733 printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n", 20734 gnutls_check_version(NULL) ); 20735 printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n", 20360 20736 "$min_libgnutls_version" ); 20361 printf("*** LIBGNUTLS _EXTRAis always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");20737 printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); 20362 20738 printf("*** \n"); 20363 20739 printf("*** If you have already installed a sufficiently new version, this error\n"); 20364 printf("*** probably means that the wrong copy of the libgnutls- extra-config shell script is\n");20740 printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n"); 20365 20741 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 20366 printf("*** of LIBGNUTLS _EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n");20367 printf("*** correct copy of libgnutls- extra-config. (In this case, you will have to\n");20742 printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n"); 20743 printf("*** correct copy of libgnutls-config. (In this case, you will have to\n"); 20368 20744 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 20369 20745 printf("*** so that the correct libraries are found at run-time))\n"); … … 20422 20798 echo "${ECHO_T}no" >&6; } 20423 20799 fi 20424 if test "$LIBGNUTLS_ EXTRA_CONFIG" = "no" ; then20425 echo "*** The libgnutls- extra-config script installed by LIBGNUTLS_EXTRAcould not be found"20426 echo "*** If LIBGNUTLS _EXTRAwas installed in PREFIX, make sure PREFIX/bin is in"20427 echo "*** your path, or set the LIBGNUTLS_ EXTRA_CONFIG environment variable to the"20428 echo "*** full path to libgnutls- extra-config."20800 if test "$LIBGNUTLS_CONFIG" = "no" ; then 20801 echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" 20802 echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in" 20803 echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the" 20804 echo "*** full path to libgnutls-config." 20429 20805 else 20430 20806 if test -f conf.libgnutlstest ; then … … 20432 20808 else 20433 20809 echo "*** Could not run libgnutls test program, checking why..." 20434 CFLAGS="$CFLAGS $LIBGNUTLS_ EXTRA_CFLAGS"20435 LIBS="$LIBS $LIBGNUTLS_ EXTRA_LIBS"20810 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" 20811 LIBS="$LIBS $LIBGNUTLS_LIBS" 20436 20812 cat >conftest.$ac_ext <<_ACEOF 20437 20813 /* confdefs.h. */ … … 20444 20820 #include <stdlib.h> 20445 20821 #include <string.h> 20446 #include <gnutls/ extra.h>20822 #include <gnutls/gnutls.h> 20447 20823 20448 20824 int 20449 20825 main () 20450 20826 { 20451 return !!gnutls_ extra_check_version(NULL);20827 return !!gnutls_check_version(NULL); 20452 20828 ; 20453 20829 return 0; … … 20473 20849 $as_test_x conftest$ac_exeext; then 20474 20850 echo "*** The test program compiled, but did not run. This usually means" 20475 echo "*** that the run-time linker is not finding LIBGNUTLS _EXTRAor finding the wrong"20476 echo "*** version of LIBGNUTLS _EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your"20851 echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" 20852 echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" 20477 20853 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" 20478 20854 echo "*** to the installed location Also, make sure you have run ldconfig if that" … … 20487 20863 20488 20864 echo "*** The test program failed to compile or link. See the file config.log for the" 20489 echo "*** exact error that occured. This usually means LIBGNUTLS _EXTRAwas incorrectly installed"20490 echo "*** or that you have moved LIBGNUTLS _EXTRAsince it was installed. In the latter case, you"20491 echo "*** may want to edit the libgnutls- extra-config script: $LIBGNUTLS_EXTRA_CONFIG"20865 echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" 20866 echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" 20867 echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" 20492 20868 fi 20493 20869 … … 20498 20874 fi 20499 20875 fi 20500 LIBGNUTLS_ EXTRA_CFLAGS=""20501 LIBGNUTLS_ EXTRA_LIBS=""20876 LIBGNUTLS_CFLAGS="" 20877 LIBGNUTLS_LIBS="" 20502 20878 { { echo "$as_me:$LINENO: error: 20503 20879 *** 20504 *** libgnutls and libgnutls-extra werenot found. You may want to get it from20880 *** libgnutls was not found. You may want to get it from 20505 20881 *** http://www.gnutls.org/ 20506 20882 *** … … 20508 20884 echo "$as_me: error: 20509 20885 *** 20510 *** libgnutls and libgnutls-extra werenot found. You may want to get it from20886 *** libgnutls was not found. You may want to get it from 20511 20887 *** http://www.gnutls.org/ 20512 20888 *** … … 20516 20892 rm -f conf.libgnutlstest 20517 20893 20518 20519 20520 LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS 20521 LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS 20522 LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` 20523 LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`" 20894 LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` 20895 LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`" 20524 20896 GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool" 20525 20897 … … 20557 20929 withval=$with_apr_memcache_prefix; apr_memcache_prefix="$withval" 20558 20930 else 20559 apr_memcache_prefix="/usr"20931 : 20560 20932 fi 20561 20933 … … 20565 20937 withval=$with_apr_memcache_libs; apr_memcache_libs="$withval" 20566 20938 else 20567 apr_memcache_libs="$apr_memcache_prefix/lib" 20568 : 20939 : 20569 20940 fi 20570 20941 … … 20574 20945 withval=$with_apr_memcache_includes; apr_memcache_includes="$withval" 20575 20946 else 20576 apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0" 20577 : 20947 : 20578 20948 fi 20579 20949 … … 20664 21034 ;; 20665 21035 20666 aix 4* | aix5*)21036 aix[4-9]*) 20667 21037 version_type=linux 20668 21038 need_lib_prefix=no … … 21198 21568 test "$dynamic_linker" = no && can_build_shared=no 21199 21569 21570 if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 21571 echo $ECHO_N "(cached) $ECHO_C" >&6 21572 else 21573 lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" 21574 fi 21575 21576 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 21577 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then 21578 echo $ECHO_N "(cached) $ECHO_C" >&6 21579 else 21580 lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" 21581 fi 21582 21583 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" 21584 21200 21585 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" 21201 21586 if test "$GCC" = yes; then … … 21206 21591 save_CFLAGS=$CFLAGS 21207 21592 save_LDFLAGS=$LDFLAGS 21208 CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS" 21209 LDFLAGS="-L$apr_memcache_libs $LDFLAGS" 21593 21594 if test -n "$apr_memcache_libs"; then 21595 apr_memcache_libdir=$apr_memcache_libs 21596 elif test -n "$apr_memcache_prefix"; then 21597 apr_memcache_libdir=$apr_memcache_prefix/lib 21598 fi 21599 if test -n "$apr_memcache_libdir"; then 21600 LDFLAGS="-L$apr_memcache_libdir $LDFLAGS" 21601 fi 21602 21603 if test -n "$apr_memcache_includes"; then 21604 apr_memcache_includedir=$apr_memcache_includes 21605 elif test -n "$apr_memcache_prefix"; then 21606 apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0 21607 else 21608 apr_memcache_includedir=$includedir/apr_memcache-0 21609 fi 21610 CFLAGS="-I$apr_memcache_includedir $CFLAGS" 21611 21210 21612 { echo "$as_me:$LINENO: checking for apr_memcache_create in -lapr_memcache" >&5 21211 21613 echo $ECHO_N "checking for apr_memcache_create in -lapr_memcache... $ECHO_C" >&6; } … … 21271 21673 if test $ac_cv_lib_apr_memcache_apr_memcache_create = yes; then 21272 21674 21273 APR_MEMCACHE_LIBS="-R$apr_memcache_libs -L$apr_memcache_libs -lapr_memcache" 21274 APR_MEMCACHE_CFLAGS="-I$apr_memcache_includes" 21675 APR_MEMCACHE_LIBS="-lapr_memcache" 21676 if test -n "$apr_memcache_libdir"; then 21677 APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS" 21678 fi 21679 APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir" 21275 21680 21276 21681 … … 21727 22132 # values after options handling. 21728 22133 ac_log=" 21729 This file was extended by mod_gnutls $as_me 0.5. 1, which was22134 This file was extended by mod_gnutls $as_me 0.5.2, which was 21730 22135 generated by GNU Autoconf 2.61. Invocation command line was 21731 22136 … … 21780 22185 cat >>$CONFIG_STATUS <<_ACEOF 21781 22186 ac_cs_version="\\ 21782 mod_gnutls config.status 0.5. 122187 mod_gnutls config.status 0.5.2 21783 22188 configured by $0, generated by GNU Autoconf 2.61, 21784 22189 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" … … 22101 22506 AR!$AR$ac_delim 22102 22507 RANLIB!$RANLIB$ac_delim 22508 DSYMUTIL!$DSYMUTIL$ac_delim 22509 NMEDIT!$NMEDIT$ac_delim 22103 22510 CPP!$CPP$ac_delim 22104 22511 CXX!$CXX$ac_delim … … 22137 22544 APXS_EXTENSION!$APXS_EXTENSION$ac_delim 22138 22545 APXS_CFLAGS!$APXS_CFLAGS$ac_delim 22139 LIBGNUTLS_EXTRA_CONFIG!$LIBGNUTLS_EXTRA_CONFIG$ac_delim 22140 LIBGNUTLS_EXTRA_CFLAGS!$LIBGNUTLS_EXTRA_CFLAGS$ac_delim 22141 LIBGNUTLS_EXTRA_LIBS!$LIBGNUTLS_EXTRA_LIBS$ac_delim 22546 LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim 22142 22547 LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim 22143 22548 LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim … … 22555 22960 rm -f "$tmp/out12" 22556 22961 # Compute $ac_file's index in $config_headers. 22962 _am_arg=$ac_file 22557 22963 _am_stamp_count=1 22558 22964 for _am_header in $config_headers :; do 22559 22965 case $_am_header in 22560 $ ac_file | $ac_file:* )22966 $_am_arg | $_am_arg:* ) 22561 22967 break ;; 22562 22968 * ) … … 22564 22970 esac 22565 22971 done 22566 echo "timestamp for $ ac_file" >`$as_dirname -- $ac_file||22567 $as_expr X $ac_file: 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \22568 X $ac_file: 'X\(//\)[^/]' \| \22569 X $ac_file: 'X\(//\)$' \| \22570 X $ac_file: 'X\(/\)' \| . 2>/dev/null ||22571 echo X $ac_file|22972 echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || 22973 $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 22974 X"$_am_arg" : 'X\(//\)[^/]' \| \ 22975 X"$_am_arg" : 'X\(//\)$' \| \ 22976 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || 22977 echo X"$_am_arg" | 22572 22978 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 22573 22979 s//\1/ … … 22606 23012 # Grep'ing the whole file is not good either: AIX grep has a line 22607 23013 # limit of 2048, but all sed's we know have understand at least 4000. 22608 if sed 10q "$mf" | grep '^#.*generated by automake' >/dev/null 2>&1; then23014 if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then 22609 23015 dirpart=`$as_dirname -- "$mf" || 22610 23016 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -
configure.ac
r2dd044f r54b3065 1 1 dnl 2 AC_INIT(mod_gnutls, 0.5. 1)2 AC_INIT(mod_gnutls, 0.5.2) 3 3 OOO_CONFIG_NICE(config.nice) 4 4 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION … … 29 29 dnl AC_SUBST(LIBTOOL) 30 30 31 MIN_TLS_VERSION=2. 2.132 AM_PATH_LIBGNUTLS _EXTRA($MIN_TLS_VERSION,,31 MIN_TLS_VERSION=2.4.0 32 AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,, 33 33 AC_MSG_ERROR([[ 34 34 *** 35 *** libgnutls and libgnutls-extra werenot found. You may want to get it from35 *** libgnutls was not found. You may want to get it from 36 36 *** http://www.gnutls.org/ 37 37 *** -
m4/apr_memcache.m4
r2dd044f r54b3065 10 10 [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])], 11 11 apr_memcache_prefix="$withval", 12 apr_memcache_prefix="/usr",13 12 :) 14 13 AC_ARG_WITH( … … 16 15 [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])], 17 16 apr_memcache_libs="$withval", 18 apr_memcache_libs="$apr_memcache_prefix/lib"19 17 :) 20 18 AC_ARG_WITH( … … 22 20 [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])], 23 21 apr_memcache_includes="$withval", 24 apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0"25 22 :) 26 23 … … 31 28 save_CFLAGS=$CFLAGS 32 29 save_LDFLAGS=$LDFLAGS 33 CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS" 34 LDFLAGS="-L$apr_memcache_libs $LDFLAGS" 30 31 if test -n "$apr_memcache_libs"; then 32 apr_memcache_libdir=$apr_memcache_libs 33 elif test -n "$apr_memcache_prefix"; then 34 apr_memcache_libdir=$apr_memcache_prefix/lib 35 fi 36 if test -n "$apr_memcache_libdir"; then 37 LDFLAGS="-L$apr_memcache_libdir $LDFLAGS" 38 fi 39 40 if test -n "$apr_memcache_includes"; then 41 apr_memcache_includedir=$apr_memcache_includes 42 elif test -n "$apr_memcache_prefix"; then 43 apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0 44 else 45 apr_memcache_includedir=$includedir/apr_memcache-0 46 fi 47 CFLAGS="-I$apr_memcache_includedir $CFLAGS" 48 35 49 AC_CHECK_LIB( 36 50 apr_memcache, 37 51 apr_memcache_create, 38 52 [ 39 APR_MEMCACHE_LIBS="-R$apr_memcache_libs -L$apr_memcache_libs -lapr_memcache" 40 APR_MEMCACHE_CFLAGS="-I$apr_memcache_includes" 53 APR_MEMCACHE_LIBS="-lapr_memcache" 54 if test -n "$apr_memcache_libdir"; then 55 APR_MEMCACHE_LIBS="-R$apr_memcache_libdir -L$apr_memcache_libdir $APR_MEMCACHE_LIBS" 56 fi 57 APR_MEMCACHE_CFLAGS="-I$apr_memcache_includedir" 41 58 ] 42 59 ) -
m4/libgnutls.m4
r2dd044f r54b3065 1 dnl Autoconf macros for libgnutls -extra1 dnl Autoconf macros for libgnutls 2 2 dnl $id$ 3 3 4 # Modified for LIBGNUTLS _EXTRA-- nmav4 # Modified for LIBGNUTLS -- nmav 5 5 # Configure paths for LIBGCRYPT 6 6 # Shamelessly stolen from the one of XDELTA by Owen Taylor 7 7 # Werner Koch 99-12-09 8 8 9 dnl AM_PATH_LIBGNUTLS _EXTRA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])10 dnl Test for libgnutls -extra, and define LIBGNUTLS_EXTRA_CFLAGS and LIBGNUTLS_EXTRA_LIBS9 dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) 10 dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS 11 11 dnl 12 AC_DEFUN([AM_PATH_LIBGNUTLS _EXTRA],12 AC_DEFUN([AM_PATH_LIBGNUTLS], 13 13 [dnl 14 dnl Get the cflags and libraries from the libgnutls- extra-config script14 dnl Get the cflags and libraries from the libgnutls-config script 15 15 dnl 16 AC_ARG_WITH(libgnutls- extra-prefix,17 [ --with-libgnutls- extra-prefix=PFX Prefix where libgnutls-extrais installed (optional)],18 libgnutls_ extra_config_prefix="$withval", libgnutls_extra_config_prefix="")16 AC_ARG_WITH(libgnutls-prefix, 17 [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)], 18 libgnutls_config_prefix="$withval", libgnutls_config_prefix="") 19 19 20 if test x$libgnutls_ extra_config_prefix != x ; then21 if test x${LIBGNUTLS_ EXTRA_CONFIG+set} != xset ; then22 LIBGNUTLS_ EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config20 if test x$libgnutls_config_prefix != x ; then 21 if test x${LIBGNUTLS_CONFIG+set} != xset ; then 22 LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config 23 23 fi 24 24 fi 25 25 26 AC_PATH_PROG(LIBGNUTLS_ EXTRA_CONFIG, libgnutls-extra-config, no)26 AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no) 27 27 min_libgnutls_version=ifelse([$1], ,0.1.0,$1) 28 28 AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) 29 29 no_libgnutls="" 30 if test "$LIBGNUTLS_ EXTRA_CONFIG" = "no" ; then30 if test "$LIBGNUTLS_CONFIG" = "no" ; then 31 31 no_libgnutls=yes 32 32 else 33 LIBGNUTLS_ EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags`34 LIBGNUTLS_ EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs`35 libgnutls_ extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`33 LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags` 34 LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs` 35 libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` 36 36 37 37 38 38 ac_save_CFLAGS="$CFLAGS" 39 39 ac_save_LIBS="$LIBS" 40 CFLAGS="$CFLAGS $LIBGNUTLS_ EXTRA_CFLAGS"41 LIBS="$LIBS $LIBGNUTLS_ EXTRA_LIBS"40 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" 41 LIBS="$LIBS $LIBGNUTLS_LIBS" 42 42 dnl 43 43 dnl Now check if the installed libgnutls is sufficiently new. Also sanity 44 dnl checks the results of libgnutls- extra-config to some extent44 dnl checks the results of libgnutls-config to some extent 45 45 dnl 46 46 rm -f conf.libgnutlstest … … 49 49 #include <stdlib.h> 50 50 #include <string.h> 51 #include <gnutls/ extra.h>51 #include <gnutls/gnutls.h> 52 52 53 53 int … … 56 56 system ("touch conf.libgnutlstest"); 57 57 58 if( strcmp( gnutls_ extra_check_version(NULL), "$libgnutls_extra_config_version" ) )58 if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) ) 59 59 { 60 printf("\n*** 'libgnutls- extra-config --version' returned %s, but LIBGNUTLS_EXTRA(%s)\n",61 "$libgnutls_ extra_config_version", gnutls_extra_check_version(NULL) );62 printf("*** was found! If libgnutls- extra-config was correct, then it is best\n");63 printf("*** to remove the old version of LIBGNUTLS _EXTRA. You may also be able to fix the error\n");60 printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n", 61 "$libgnutls_config_version", gnutls_check_version(NULL) ); 62 printf("*** was found! If libgnutls-config was correct, then it is best\n"); 63 printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n"); 64 64 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 65 65 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 66 66 printf("*** required on your system.\n"); 67 printf("*** If libgnutls- extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n");68 printf("*** to point to the correct copy of libgnutls- extra-config, and remove the file config.cache\n");67 printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n"); 68 printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n"); 69 69 printf("*** before re-running configure\n"); 70 70 } 71 else if ( strcmp(gnutls_ extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) )71 else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) ) 72 72 { 73 printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION); 74 printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) ); 75 printf("*** and gnutls-extra.\n"); 73 printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION); 74 printf("*** library (version %s)\n", gnutls_check_version(NULL) ); 76 75 } 77 76 else 78 77 { 79 if ( gnutls_ extra_check_version( "$min_libgnutls_version" ) )78 if ( gnutls_check_version( "$min_libgnutls_version" ) ) 80 79 { 81 80 return 0; … … 83 82 else 84 83 { 85 printf("no\n*** An old version of LIBGNUTLS _EXTRA(%s) was found.\n",86 gnutls_ extra_check_version(NULL) );87 printf("*** You need a version of LIBGNUTLS _EXTRAnewer than %s. The latest version of\n",84 printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n", 85 gnutls_check_version(NULL) ); 86 printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n", 88 87 "$min_libgnutls_version" ); 89 printf("*** LIBGNUTLS _EXTRAis always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");88 printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); 90 89 printf("*** \n"); 91 90 printf("*** If you have already installed a sufficiently new version, this error\n"); 92 printf("*** probably means that the wrong copy of the libgnutls- extra-config shell script is\n");91 printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n"); 93 92 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 94 printf("*** of LIBGNUTLS _EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n");95 printf("*** correct copy of libgnutls- extra-config. (In this case, you will have to\n");93 printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n"); 94 printf("*** correct copy of libgnutls-config. (In this case, you will have to\n"); 96 95 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 97 96 printf("*** so that the correct libraries are found at run-time))\n"); … … 114 113 AC_MSG_RESULT(no) 115 114 fi 116 if test "$LIBGNUTLS_ EXTRA_CONFIG" = "no" ; then117 echo "*** The libgnutls- extra-config script installed by LIBGNUTLS_EXTRAcould not be found"118 echo "*** If LIBGNUTLS _EXTRAwas installed in PREFIX, make sure PREFIX/bin is in"119 echo "*** your path, or set the LIBGNUTLS_ EXTRA_CONFIG environment variable to the"120 echo "*** full path to libgnutls- extra-config."115 if test "$LIBGNUTLS_CONFIG" = "no" ; then 116 echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found" 117 echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in" 118 echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the" 119 echo "*** full path to libgnutls-config." 121 120 else 122 121 if test -f conf.libgnutlstest ; then … … 124 123 else 125 124 echo "*** Could not run libgnutls test program, checking why..." 126 CFLAGS="$CFLAGS $LIBGNUTLS_ EXTRA_CFLAGS"127 LIBS="$LIBS $LIBGNUTLS_ EXTRA_LIBS"125 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" 126 LIBS="$LIBS $LIBGNUTLS_LIBS" 128 127 AC_TRY_LINK([ 129 128 #include <stdio.h> 130 129 #include <stdlib.h> 131 130 #include <string.h> 132 #include <gnutls/ extra.h>133 ], [ return !!gnutls_ extra_check_version(NULL); ],131 #include <gnutls/gnutls.h> 132 ], [ return !!gnutls_check_version(NULL); ], 134 133 [ echo "*** The test program compiled, but did not run. This usually means" 135 echo "*** that the run-time linker is not finding LIBGNUTLS _EXTRAor finding the wrong"136 echo "*** version of LIBGNUTLS _EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your"134 echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong" 135 echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your" 137 136 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" 138 137 echo "*** to the installed location Also, make sure you have run ldconfig if that" … … 143 142 echo "***" ], 144 143 [ echo "*** The test program failed to compile or link. See the file config.log for the" 145 echo "*** exact error that occured. This usually means LIBGNUTLS _EXTRAwas incorrectly installed"146 echo "*** or that you have moved LIBGNUTLS _EXTRAsince it was installed. In the latter case, you"147 echo "*** may want to edit the libgnutls- extra-config script: $LIBGNUTLS_EXTRA_CONFIG" ])144 echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" 145 echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" 146 echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ]) 148 147 CFLAGS="$ac_save_CFLAGS" 149 148 LIBS="$ac_save_LIBS" 150 149 fi 151 150 fi 152 LIBGNUTLS_ EXTRA_CFLAGS=""153 LIBGNUTLS_ EXTRA_LIBS=""151 LIBGNUTLS_CFLAGS="" 152 LIBGNUTLS_LIBS="" 154 153 ifelse([$3], , :, [$3]) 155 154 fi 156 155 rm -f conf.libgnutlstest 157 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)158 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)159 156 160 LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS 161 LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS 162 LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` 163 LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`" 157 LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version` 158 LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`" 164 159 GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool" 165 160 … … 169 164 AC_SUBST(LIBGNUTLS_PREFIX) 170 165 AC_SUBST(LIBGNUTLS_CERTTOOL) 171 166 172 167 ]) 173 168 -
src/Makefile.in
r2dd044f r54b3065 1 # Makefile.in generated by automake 1.10 from Makefile.am.1 # Makefile.in generated by automake 1.10.1 from Makefile.am. 2 2 # @configure_input@ 3 3 4 4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 5 # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.5 # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 6 6 # This Makefile.in is free software; the Free Software Foundation 7 7 # gives unlimited permission to copy and/or distribute it, … … 64 64 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmod_gnutls_la_CFLAGS) \ 65 65 $(CFLAGS) $(libmod_gnutls_la_LDFLAGS) $(LDFLAGS) -o $@ 66 DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@66 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include 67 67 depcomp = $(SHELL) $(top_srcdir)/config/depcomp 68 68 am__depfiles_maybe = depfiles … … 126 126 DEFS = @DEFS@ 127 127 DEPDIR = @DEPDIR@ 128 DSYMUTIL = @DSYMUTIL@ 128 129 ECHO = @ECHO@ 129 130 ECHO_C = @ECHO_C@ … … 143 144 LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@ 144 145 LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 145 LIBGNUTLS_EXTRA_CFLAGS = @LIBGNUTLS_EXTRA_CFLAGS@ 146 LIBGNUTLS_EXTRA_CONFIG = @LIBGNUTLS_EXTRA_CONFIG@ 147 LIBGNUTLS_EXTRA_LIBS = @LIBGNUTLS_EXTRA_LIBS@ 146 LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ 148 147 LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ 149 148 LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@ … … 160 159 MODULE_LIBS = @MODULE_LIBS@ 161 160 MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@ 161 NMEDIT = @NMEDIT@ 162 162 OBJEXT = @OBJEXT@ 163 163 OOO_MAINTAIN = @OOO_MAINTAIN@ … … 276 276 if test -f $$p; then \ 277 277 f=$(am__strip_dir) \ 278 echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \279 $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \278 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ 279 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ 280 280 else :; fi; \ 281 281 done … … 285 285 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 286 286 p=$(am__strip_dir) \ 287 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \288 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \287 echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ 288 $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 289 289 done 290 290 … … 379 379 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 380 380 done | \ 381 $(AWK) ' { files[$$0]= 1; } \382 END { for (i in files) print i; }'`; \381 $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ 382 END { if (nonempty) { for (i in files) print i; }; }'`; \ 383 383 mkid -fID $$unique 384 384 tags: TAGS … … 392 392 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 393 393 done | \ 394 $(AWK) ' { files[$$0]= 1; } \395 END { for (i in files) print i; }'`; \394 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 395 END { if (nonempty) { for (i in files) print i; }; }'`; \ 396 396 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 397 397 test -n "$$unique" || unique=$$empty_fix; \ … … 403 403 $(TAGS_FILES) $(LISP) 404 404 tags=; \ 405 here=`pwd`; \406 405 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ 407 406 unique=`for i in $$list; do \ 408 407 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ 409 408 done | \ 410 $(AWK) ' { files[$$0]= 1; } \411 END { for (i in files) print i; }'`; \409 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ 410 END { if (nonempty) { for (i in files) print i; }; }'`; \ 412 411 test -z "$(CTAGS_ARGS)$$tags$$unique" \ 413 412 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -
src/gnutls_hooks.c
r2dd044f r54b3065 84 84 } 85 85 86 ret = gnutls_global_init_extra();87 if (ret < 0) {88 fprintf(stderr, "gnutls_global_init_extra: %s\n", gnutls_strerror(ret));89 return -3;90 }91 92 86 apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config, 93 87 apr_pool_cleanup_null);
Note: See TracChangeset
for help on using the changeset viewer.