Changeset 8ce897a in mod_gnutls


Ignore:
Timestamp:
Jan 11, 2013, 12:57:01 AM (7 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
54b3065, f8ffc43
Parents:
9d9b093
Message:

Imported Upstream version 0.5.2

Files:
14 edited

Legend:

Unmodified
Added
Removed
  • Makefile.in

    r9d9b093 r8ce897a  
    1 # Makefile.in generated by automake 1.10 from Makefile.am.
     1# Makefile.in generated by automake 1.10.1 from Makefile.am.
    22# @configure_input@
    33
    44# 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.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
     
    121121DEFS = @DEFS@
    122122DEPDIR = @DEPDIR@
     123DSYMUTIL = @DSYMUTIL@
    123124ECHO = @ECHO@
    124125ECHO_C = @ECHO_C@
     
    138139LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@
    139140LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
    140 LIBGNUTLS_EXTRA_CFLAGS = @LIBGNUTLS_EXTRA_CFLAGS@
    141 LIBGNUTLS_EXTRA_CONFIG = @LIBGNUTLS_EXTRA_CONFIG@
    142 LIBGNUTLS_EXTRA_LIBS = @LIBGNUTLS_EXTRA_LIBS@
     141LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
    143142LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
    144143LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@
     
    155154MODULE_LIBS = @MODULE_LIBS@
    156155MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
     156NMEDIT = @NMEDIT@
    157157OBJEXT = @OBJEXT@
    158158OOO_MAINTAIN = @OOO_MAINTAIN@
     
    376376            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    377377          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; }; }'`; \
    380380        mkid -fID $$unique
    381381tags: TAGS
     
    402402            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    403403          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; }; }'`; \
    406406        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
    407407          test -n "$$unique" || unique=$$empty_fix; \
     
    413413                $(TAGS_FILES) $(LISP)
    414414        tags=; \
    415         here=`pwd`; \
    416415        list='$(SOURCES) $(HEADERS) config.in $(LISP) $(TAGS_FILES)'; \
    417416        unique=`for i in $$list; do \
    418417            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    419418          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; }; }'`; \
    422421        test -z "$(CTAGS_ARGS)$$tags$$unique" \
    423422          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     
    489488        $(am__remove_distdir)
    490489
     490dist-lzma: distdir
     491        tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
     492        $(am__remove_distdir)
     493
    491494dist-tarZ: distdir
    492495        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
     
    516519        *.tar.bz2*) \
    517520          bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
     521        *.tar.lzma*) \
     522          unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
    518523        *.tar.Z*) \
    519524          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
     
    667672        all all-am am--refresh check check-am clean clean-generic \
    668673        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 \
    671676        distclean-tags distcleancheck distdir distuninstallcheck dvi \
    672677        dvi-am html html-am info info-am install install-am \
  • NEWS

    r9d9b093 r8ce897a  
     1** Version 0.5.2 (2008-06-29)
     2
     3- Depend on gnutls 2.4 which has openpgp support in main library.
     4
    15** Version 0.5.1 (2008-03-05)
    26
  • aclocal.m4

    r9d9b093 r8ce897a  
    1 # generated automatically by aclocal 1.10 -*- Autoconf -*-
     1# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
    22
    33# 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.
    55# This file is free software; the Free Software Foundation
    66# gives unlimited permission to copy and/or distribute it,
     
    1212# PARTICULAR PURPOSE.
    1313
    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])])
     14m4_ifndef([AC_AUTOCONF_VERSION],
     15  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
     16m4_if(AC_AUTOCONF_VERSION, [2.61],,
     17[m4_warning([this file was generated for autoconf 2.61.
     18You have another version of autoconf.  It may work, but is not guaranteed to.
     19If you have problems, you may need to regenerate the build system entirely.
     20To do so, use the procedure documented by the package, typically `autoreconf'.])])
    1821
    1922# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
    2023
    21 # serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
     24# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
    2225
    2326
     
    107110AC_REQUIRE([AC_EXEEXT])dnl
    108111dnl
    109 
    110112AC_LIBTOOL_SYS_MAX_CMD_LEN
    111113AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
     
    209211esac
    210212
     213_LT_REQUIRED_DARWIN_CHECKS
     214
    211215AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
    212216AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
     
    288292eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
    289293_lt_linker_boilerplate=`cat conftest.err`
    290 $rm conftest*
     294$rm -r conftest*
    291295])# _LT_LINKER_BOILERPLATE
    292296
     297# _LT_REQUIRED_DARWIN_CHECKS
     298# --------------------------
     299# Check for some things on darwin
     300AC_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])
    293368
    294369# _LT_AC_SYS_LIBPATH_AIX
     
    615690      case $lt_cv_prog_gnu_ld in
    616691      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        ;;
    618697      esac
    619698      ;;
     
    708787     fi
    709788   fi
    710    $rm conftest*
     789   $rm -r conftest*
    711790   LDFLAGS="$save_LDFLAGS"
    712791])
     
    9791058          [lt_cv_dlopen="shl_load"],
    9801059      [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"],
    9821061        [AC_CHECK_FUNC([dlopen],
    9831062              [lt_cv_dlopen="dlopen"],
     
    9871066                  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
    9881067              [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"])
    9901069              ])
    9911070            ])
     
    13041383  ;;
    13051384
    1306 aix4* | aix5*)
     1385aix[[4-9]]*)
    13071386  version_type=linux
    13081387  need_lib_prefix=no
     
    18361915AC_MSG_RESULT([$dynamic_linker])
    18371916test "$dynamic_linker" = no && can_build_shared=no
     1917
     1918AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
     1919[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
     1920sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
     1921AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
     1922[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
     1923sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
    18381924
    18391925variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
     
    23362422
    23372423case $host_os in
    2338 aix4* | aix5*)
     2424aix[[4-9]]*)
    23392425  lt_cv_deplibs_check_method=pass_all
    23402426  ;;
     
    27722858  ;;
    27732859
    2774 aix4* | aix5*)
     2860aix[[4-9]]*)
    27752861  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
    27762862    test "$enable_shared" = yes && enable_static=no
     
    28292915_LT_AC_TAGVAR(postdeps, $1)=
    28302916_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
     2917_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
    28312918
    28322919# Source file extension for C++ test sources.
     
    29383025    _LT_AC_TAGVAR(ld_shlibs, $1)=no
    29393026    ;;
    2940   aix4* | aix5*)
     3027  aix[[4-9]]*)
    29413028    if test "$host_cpu" = ia64; then
    29423029      # On IA64, the linker does run time linking by default, so we don't
     
    29513038      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
    29523039      # need to do runtime linking.
    2953       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
     3040      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
    29543041        for ld_flag in $LDFLAGS; do
    29553042          case $ld_flag in
     
    30973184  ;;
    30983185      darwin* | rhapsody*)
    3099         case $host_os in
    3100         rhapsody* | darwin1.[[012]])
    3101          _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
    3102          ;;
    3103        *) # Darwin 1.3 on
    3104          if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
    3105            _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
    3106          else
    3107            case ${MACOSX_DEPLOYMENT_TARGET} in
    3108              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            esac
    3115          fi
    3116          ;;
    3117         esac
    31183186      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
    31193187      _LT_AC_TAGVAR(hardcode_direct, $1)=no
     
    31223190      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
    31233191      _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
    31273194      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}"
    31303202      fi
    3131       if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
    3132        _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       else
    3134           _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         fi
    3136         _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 lds
    3138           if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
    3139             _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           else
    3141             _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           fi
    3143             _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}'
    31443203      else
    31453204      case $cc_basename in
     
    33923451        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
    33933452        ;;
    3394       pgCC*)
     3453      pgCC* | pgcpp*)
    33953454        # Portland Group C++ compiler
    33963455        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
     
    38273886# Parse the compiler output and extract the necessary
    38283887# objects, libraries and library flags.
    3829 AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
     3888AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
     3889[AC_REQUIRE([LT_AC_PROG_SED])dnl
    38303890dnl we can't use the lt_simple_compile_test_code here,
    38313891dnl because it contains code intended for an executable,
     
    39524012$rm -f confest.$objext
    39534013
     4014_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
     4015if 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!^ !!'`
     4017fi
     4018
    39544019# PORTME: override above test on systems where it is broken
    39554020ifelse([$1],[CXX],
     
    40084073esac
    40094074])
    4010 
    40114075case " $_LT_AC_TAGVAR(postdeps, $1) " in
    40124076*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
     
    40934157  fi
    40944158  ;;
    4095 aix4* | aix5*)
     4159aix[[4-9]]*)
    40964160  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
    40974161    test "$enable_shared" = yes && enable_static=no
     
    42704334    _LT_AC_TAGVAR(postdeps, $1) \
    42714335    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
     4336    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
    42724337    _LT_AC_TAGVAR(archive_cmds, $1) \
    42734338    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     
    43324397# NOTE: Changes made to this file will be lost: look at ltmain.sh.
    43334398#
    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
    43354400# Free Software Foundation, Inc.
    43364401#
     
    45684633# shared library.
    45694634postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
     4635
     4636# The directories searched by this compiler when creating a shared
     4637# library
     4638compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
    45704639
    45714640# The library search path used internally by the compiler when linking
     
    49184987    cat conftest.$ac_ext >&5
    49194988  fi
    4920   rm -f conftest* conftst*
     4989  rm -rf conftest* conftst*
    49214990
    49224991  # Do not use the global_symbol_pipe unless it works.
     
    49755044      # Although the cygwin gcc ignores -fPIC, still need this for old-style
    49765045      # (--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'])
    49785048      ;;
    49795049    darwin* | rhapsody*)
     
    50125082  else
    50135083    case $host_os in
    5014       aix4* | aix5*)
     5084      aix[[4-9]]*)
    50155085        # All AIX code is PIC.
    50165086        if test "$host_cpu" = ia64; then
     
    51085178            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
    51095179            ;;
    5110           pgCC*)
     5180          pgCC* | pgcpp*)
    51115181            # Portland Group C++ compiler.
    51125182            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
     
    52595329      # Although the cygwin gcc ignores -fPIC, still need this for old-style
    52605330      # (--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'])
    52625333      ;;
    52635334
     
    53295400      # This hack is so that the source file can tell whether it is being
    53305401      # 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'])
    53325404      ;;
    53335405
     
    54665538if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
    54675539  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),
    54695541    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
    54705542    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
     
    54905562wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
    54915563AC_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),
    54935565  $lt_tmp_static_flag,
    54945566  [],
     
    55065578  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    55075579  case $host_os in
    5508   aix4* | aix5*)
     5580  aix[[4-9]]*)
    55095581    # If we're using GNU nm, then we don't want the "-C" option.
    55105582    # -C means demangle to AIX nm, but means don't demangle with GNU nm
     
    55285600  ;;
    55295601  esac
     5602  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
    55305603],[
    55315604  runpath_var=
     
    55585631  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    55595632  # 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]_.*']
    55615634  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
    55625635  # platforms (ab)use it in PIC code, but their linkers get confused if
     
    55645637  # rely on this symbol name, it's probably fine to never include it in
    55655638  # preloaded symbol tables.
     5639  # Exclude shared library initialization/finalization symbols.
     5640dnl Note also adjust exclude_expsyms for C++ above.
    55665641  extract_expsyms_cmds=
    55675642  # Just being paranoid about ensuring that cc_basename is set.
     
    56135688    # See if GNU ld supports shared libraries.
    56145689    case $host_os in
    5615     aix3* | aix4* | aix5*)
     5690    aix[[3-9]]*)
    56165691      # On AIX/PPC, the GNU linker is very broken
    56175692      if test "$host_cpu" != ia64; then
     
    58335908      ;;
    58345909
    5835     aix4* | aix5*)
     5910    aix[[4-9]]*)
    58365911      if test "$host_cpu" = ia64; then
    58375912        # On IA64, the linker does run time linking by default, so we don't
     
    58535928        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
    58545929        # need to do runtime linking.
    5855         case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
     5930        case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
    58565931          for ld_flag in $LDFLAGS; do
    58575932          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
     
    60136088    if test "$GCC" = yes ; then
    60146089        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}"
    60206094    else
    60216095      case $cc_basename in
     
    65986672])
    65996673
    6600 # Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
     6674# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
    66016675#
    66026676# This file is free software; the Free Software Foundation
     
    66136687dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
    66146688dnl require some minimum version.  Point them to the right macro.
    6615 m4_if([$1], [1.10], [],
     6689m4_if([$1], [1.10.1], [],
    66166690      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
    66176691])
     
    66296703# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
    66306704AC_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
     6706m4_ifndef([AC_AUTOCONF_VERSION],
     6707  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
     6708_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
    66336709
    66346710# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
     
    69026978  # Grep'ing the whole file is not good either: AIX grep has a line
    69036979  # 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; then
     6980  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
    69056981    dirpart=`AS_DIRNAME("$mf")`
    69066982  else
     
    69627038
    69637039# 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.
    69657041#
    69667042# This file is free software; the Free Software Foundation
     
    69687044# with or without modifications, as long as this notice is preserved.
    69697045
    6970 # serial 12
     7046# serial 13
    69717047
    69727048# This macro actually does too much.  Some checks are only needed if
     
    70737149AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
    70747150[# Compute $1's index in $config_headers.
     7151_am_arg=$1
    70757152_am_stamp_count=1
    70767153for _am_header in $config_headers :; do
    70777154  case $_am_header in
    7078     $1 | $1:* )
     7155    $_am_arg | $_am_arg:* )
    70797156      break ;;
    70807157    * )
     
    70827159  esac
    70837160done
    7084 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
     7161echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
    70857162
    70867163# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
     
    73837460# _AM_SUBST_NOTMAKE(VARIABLE)
    73847461# ---------------------------
    7385 # Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
     7462# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
    73867463# This macro is traced by Automake.
    73877464AC_DEFUN([_AM_SUBST_NOTMAKE])
  • config/config.guess

    r9d9b093 r8ce897a  
    55#   Inc.
    66
    7 timestamp='2007-03-06'
     7timestamp='2007-07-22'
    88
    99# This file is free software; you can redistribute it and/or modify it
     
    331331        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    332332        exit ;;
    333     i86pc:SunOS:5.*:*)
     333    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
    334334        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    335335        exit ;;
     
    794794    *:Interix*:[3456]*)
    795795        case ${UNAME_MACHINE} in
    796             x86) 
     796            x86)
    797797                echo i586-pc-interix${UNAME_RELEASE}
    798798                exit ;;
  • config/config.sub

    r9d9b093 r8ce897a  
    55#   Inc.
    66
    7 timestamp='2007-01-18'
     7timestamp='2007-06-28'
    88
    99# This file is (in principle) common to ALL GNU software.
     
    476476                os=-unicosmp
    477477                ;;
    478         cr16c)
    479                 basic_machine=cr16c-unknown
     478        cr16)
     479                basic_machine=cr16-unknown
    480480                os=-elf
    481481                ;;
     
    683683                basic_machine=i386-pc
    684684                os=-mingw32
     685                ;;
     686        mingw32ce)
     687                basic_machine=arm-unknown
     688                os=-mingw32ce
    685689                ;;
    686690        miniframe)
  • config/depcomp

    r9d9b093 r8ce897a  
    22# depcomp - compile a program generating dependencies as side-effects
    33
    4 scriptversion=2006-10-15.18
    5 
    6 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
     4scriptversion=2007-03-29.01
     5
     6# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
    77# Foundation, Inc.
    88
     
    216216  # start of each line; $object doesn't have directory information.
    217217  # 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$//'`
    220221  if test "$libtool" = yes; then
     222    tmpdepfile1=$dir$base.u
     223    tmpdepfile2=$base.u
     224    tmpdepfile3=$dir.libs/$base.u
    221225    "$@" -Wc,-M
    222226  else
     227    tmpdepfile1=$dir$base.u
     228    tmpdepfile2=$dir$base.u
     229    tmpdepfile3=$dir$base.u
    223230    "$@" -M
    224231  fi
    225232  stat=$?
    226233
    227   if test -f "$tmpdepfile"; then :
    228   else
    229     stripped=`echo "$stripped" | sed 's,^.*/,,'`
    230     tmpdepfile="$stripped.u"
    231   fi
    232 
    233234  if test $stat -eq 0; then :
    234235  else
    235     rm -f "$tmpdepfile"
     236    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
    236237    exit $stat
    237238  fi
    238239
     240  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     241  do
     242    test -f "$tmpdepfile" && break
     243  done
    239244  if test -f "$tmpdepfile"; then
    240     outname="$stripped.o"
    241245    # Each line is of the form `foo.o: dependent.h'.
    242246    # Do two passes, one to just change these to
    243247    # `$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"
    246251  else
    247252    # The sourcefile does not contain any dependencies, so just
  • config/install-sh

    r9d9b093 r8ce897a  
    22# install - install a program, script, or datafile
    33
    4 scriptversion=2006-10-14.15
     4scriptversion=2006-12-25.00
    55
    66# This originates from X11R5 (mit/util/scripts/install.sh), which was
     
    4949
    5050# Don't use :- since 4.3BSD and earlier shells don't like it.
    51 doit="${DOITPROG-}"
     51doit=${DOITPROG-}
    5252if test -z "$doit"; then
    5353  doit_exec=exec
     
    5959# or use environment vars.
    6060
    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=
     61chgrpprog=${CHGRPPROG-chgrp}
     62chmodprog=${CHMODPROG-chmod}
     63chownprog=${CHOWNPROG-chown}
     64cmpprog=${CMPPROG-cmp}
     65cpprog=${CPPROG-cp}
     66mkdirprog=${MKDIRPROG-mkdir}
     67mvprog=${MVPROG-mv}
     68rmprog=${RMPROG-rm}
     69stripprog=${STRIPPROG-strip}
     70
     71posix_glob='?'
     72initialize_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
    7182posix_mkdir=
    7283
     
    7485mode=0755
    7586
     87chgrpcmd=
    7688chmodcmd=$chmodprog
    7789chowncmd=
    78 chgrpcmd=
     90mvcmd=$mvprog
     91rmcmd="$rmprog -f"
    7992stripcmd=
    80 rmcmd="$rmprog -f"
    81 mvcmd="$mvprog"
     93
    8294src=
    8395dst=
    8496dir_arg=
    85 dstarg=
     97dst_arg=
     98
     99copy_on_change=false
    86100no_target_directory=
    87101
    88 usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
     102usage="\
     103Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    89104   or: $0 [OPTION]... SRCFILES... DIRECTORY
    90105   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
     
    96111
    97112Options:
    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.
    108125
    109126Environment 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
    111129"
    112130
    113131while test $# -ne 0; do
    114132  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;;
    121138
    122139    -g) chgrpcmd="$chgrpprog $2"
    123         shift
    124         shift
    125         continue;;
     140        shift;;
    126141
    127142    --help) echo "$usage"; exit $?;;
    128143
    129144    -m) mode=$2
    130         shift
    131         shift
    132145        case $mode in
    133146          *' '* | *'    '* | *'
     
    136149            exit 1;;
    137150        esac
    138         continue;;
     151        shift;;
    139152
    140153    -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;;
    157162
    158163    --version) echo "$0 $scriptversion"; exit $?;;
     
    166171    *)  break;;
    167172  esac
     173  shift
    168174done
    169175
    170 if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
     176if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
    171177  # When -d is used, all remaining arguments are directories to create.
    172178  # When -t is used, the destination is already specified.
     
    174180  for arg
    175181  do
    176     if test -n "$dstarg"; then
     182    if test -n "$dst_arg"; then
    177183      # $@ is not empty: it contains at least $arg.
    178       set fnord "$@" "$dstarg"
     184      set fnord "$@" "$dst_arg"
    179185      shift # fnord
    180186    fi
    181187    shift # arg
    182     dstarg=$arg
     188    dst_arg=$arg
    183189  done
    184190fi
     
    225231  # Protect names starting with `-'.
    226232  case $src in
    227     -*) src=./$src ;;
     233    -*) src=./$src;;
    228234  esac
    229235
     
    243249    fi
    244250
    245     if test -z "$dstarg"; then
     251    if test -z "$dst_arg"; then
    246252      echo "$0: no destination specified." >&2
    247253      exit 1
    248254    fi
    249255
    250     dst=$dstarg
     256    dst=$dst_arg
    251257    # Protect names starting with `-'.
    252258    case $dst in
    253       -*) dst=./$dst ;;
     259      -*) dst=./$dst;;
    254260    esac
    255261
     
    258264    if test -d "$dst"; then
    259265      if test -n "$no_target_directory"; then
    260         echo "$0: $dstarg: Is a directory" >&2
     266        echo "$0: $dst_arg: Is a directory" >&2
    261267        exit 1
    262268      fi
     
    379385
    380386      case $dstdir in
    381         /*) prefix=/ ;;
    382         -*) prefix=./ ;;
    383         *)  prefix= ;;
     387        /*) prefix='/';;
     388        -*) prefix='./';;
     389        *)  prefix='';;
    384390      esac
    385391
    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"
    394393
    395394      oIFS=$IFS
    396395      IFS=/
    397       $posix_glob && set -f
     396      $posix_glob set -f
    398397      set fnord $dstdir
    399398      shift
    400       $posix_glob && set +f
     399      $posix_glob set +f
    401400      IFS=$oIFS
    402401
     
    460459    # errors from the above "$doit $cpprog $src $dsttmp" command.
    461460    #
    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
    497509
    498510    trap '' 0
  • config/ltmain.sh

    r9d9b093 r8ce897a  
    33#
    44# 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.
    66# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    77#
     
    4444PROGRAM=ltmain.sh
    4545PACKAGE=libtool
    46 VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
    47 TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
     46VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
     47TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
    4848
    4949# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
     
    114114# e.g. LANG=C (notably SCO).
    115115# We save the old values to restore during execute mode.
    116 for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
     116lt_env=
     117for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
    117118do
    118119  eval "if test \"\${$lt_var+set}\" = set; then
    119120          save_$lt_var=\$$lt_var
     121          lt_env=\"$lt_var=\$$lt_var \$lt_env\"
    120122          $lt_var=C
    121123          export $lt_var
    122124        fi"
    123125done
     126
     127if test -n "$lt_env"; then
     128  lt_env="env $lt_env"
     129fi
    124130
    125131# Make sure IFS has a sensible default
     
    486492$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
    487493
    488 Copyright (C) 2007  Free Software Foundation, Inc.
     494Copyright (C) 2008  Free Software Foundation, Inc.
    489495This is free software; see the source for copying conditions.  There is NO
    490496warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     
    789795    *.java) xform=java ;;
    790796    *.obj) xform=obj ;;
     797    *.sx) xform=sx ;;
    791798    esac
    792799
     
    957964
    958965      $show "$command"
    959       if $run eval "$command"; then :
     966      if $run eval $lt_env "$command"; then :
    960967      else
    961968        test -n "$output_obj" && $run $rm $removelist
     
    10291036      $run $rm "$obj" "$output_obj"
    10301037      $show "$command"
    1031       if $run eval "$command"; then :
     1038      if $run eval $lt_env "$command"; then :
    10321039      else
    10331040        $run $rm $removelist
     
    11621169    vinfo=
    11631170    vinfo_number=no
     1171    single_module="${wl}-single_module"
    11641172
    11651173    func_infer_tag $base_compile
     
    16471655        ;;
    16481656
     1657      -multi_module)
     1658        single_module="${wl}-multi_module"
     1659        continue
     1660        ;;
     1661
    16491662      -module)
    16501663        module=yes
     
    21532166          fi
    21542167          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
    21562174            for search_ext in .la $std_shrext .so .a; do
    21572175              # Search the libtool library
     
    29492967                  # but need to link against shared
    29502968                  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
     2969                  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
    29512970                  if test -n "$deplibrary_names" ; then
    29522971                    for tmp in $deplibrary_names ; do
    29532972                      depdepl=$tmp
    29542973                    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
    29562977                      depdepl="$path/$depdepl"
     2978                    else
     2979                      # Can't find it, oh well...
     2980                      depdepl=
    29572981                    fi
    29582982                    # do not add paths which are already there
     
    31023126    case $linkmode in
    31033127    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
    31073132
    31083133      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
     
    42464271
    42474272    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
    42514277
    42524278      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
     
    64876513
    64886514      # Restore saved environment variables
    6489       for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
     6515      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
    64906516      do
    64916517        eval "if test \"\${save_$lt_var+set}\" = set; then
  • configure

    r9d9b093 r8ce897a  
    11#! /bin/sh
    22# 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.
    44#
    55# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
     
    727727PACKAGE_NAME='mod_gnutls'
    728728PACKAGE_TARNAME='mod_gnutls'
    729 PACKAGE_VERSION='0.5.1'
    730 PACKAGE_STRING='mod_gnutls 0.5.1'
     729PACKAGE_VERSION='0.5.2'
     730PACKAGE_STRING='mod_gnutls 0.5.2'
    731731PACKAGE_BUGREPORT=''
    732732
     
    867867AR
    868868RANLIB
     869DSYMUTIL
     870NMEDIT
    869871CPP
    870872CXX
     
    903905APXS_EXTENSION
    904906APXS_CFLAGS
    905 LIBGNUTLS_EXTRA_CONFIG
    906 LIBGNUTLS_EXTRA_CFLAGS
    907 LIBGNUTLS_EXTRA_LIBS
     907LIBGNUTLS_CONFIG
    908908LIBGNUTLS_CFLAGS
    909909LIBGNUTLS_LIBS
     
    14361436  # This message is too long to be a string in the A/UX 3.1 sh.
    14371437  cat <<_ACEOF
    1438 \`configure' configures mod_gnutls 0.5.1 to adapt to many kinds of systems.
     1438\`configure' configures mod_gnutls 0.5.2 to adapt to many kinds of systems.
    14391439
    14401440Usage: $0 [OPTION]... [VAR=VALUE]...
     
    15071507if test -n "$ac_init_help"; then
    15081508  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:";;
    15101510   esac
    15111511  cat <<\_ACEOF
     
    15361536  --with-tags[=TAGS]      include additional configurations [automatic]
    15371537  --with-apxs=PATH        Path to apxs
    1538   --with-libgnutls-extra-prefix=PFX   Prefix where libgnutls-extra is installed (optional)
     1538  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)
    15391539  --with-apr-memcache-prefix=PATH
    15401540                          Install prefix for apr_memcache
     
    16221622if $ac_init_version; then
    16231623  cat <<\_ACEOF
    1624 mod_gnutls configure 0.5.1
     1624mod_gnutls configure 0.5.2
    16251625generated by GNU Autoconf 2.61
    16261626
     
    16361636running configure, to aid debugging if configure makes a mistake.
    16371637
    1638 It was created by mod_gnutls $as_me 0.5.1, which was
     1638It was created by mod_gnutls $as_me 0.5.2, which was
    16391639generated by GNU Autoconf 2.61.  Invocation command line was
    16401640
     
    20072007  chmod +x config.nice
    20082008
    2009 MOD_GNUTLS_VERSION=0.5.1
     2009MOD_GNUTLS_VERSION=0.5.2
    20102010
    20112011
     
    25082508# Define the identity of the package.
    25092509 PACKAGE=mod_gnutls
    2510  VERSION=0.5.1
     2510 VERSION=0.5.2
    25112511
    25122512
     
    43374337
    43384338case $host_os in
    4339 aix4* | aix5*)
     4339aix[4-9]*)
    43404340  lt_cv_deplibs_check_method=pass_all
    43414341  ;;
     
    47254725      case $lt_cv_prog_gnu_ld in
    47264726      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        ;;
    47284732      esac
    47294733      ;;
     
    63226326
    63236327# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
    6324 
    63256328# find the maximum length of command line arguments
    63266329{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
     
    66376640    cat conftest.$ac_ext >&5
    66386641  fi
    6639   rm -f conftest* conftst*
     6642  rm -rf conftest* conftst*
    66406643
    66416644  # Do not use the global_symbol_pipe unless it works.
     
    71977200esac
    71987201
     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.
     7207set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
     7208{ echo "$as_me:$LINENO: checking for $ac_word" >&5
     7209echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
     7210if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
     7211  echo $ECHO_N "(cached) $ECHO_C" >&6
     7212else
     7213  if test -n "$DSYMUTIL"; then
     7214  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
     7215else
     7216as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7217for as_dir in $PATH
     7218do
     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
     7227done
     7228done
     7229IFS=$as_save_IFS
     7230
     7231fi
     7232fi
     7233DSYMUTIL=$ac_cv_prog_DSYMUTIL
     7234if test -n "$DSYMUTIL"; then
     7235  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
     7236echo "${ECHO_T}$DSYMUTIL" >&6; }
     7237else
     7238  { echo "$as_me:$LINENO: result: no" >&5
     7239echo "${ECHO_T}no" >&6; }
     7240fi
     7241
     7242
     7243fi
     7244if 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.
     7247set dummy dsymutil; ac_word=$2
     7248{ echo "$as_me:$LINENO: checking for $ac_word" >&5
     7249echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
     7250if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
     7251  echo $ECHO_N "(cached) $ECHO_C" >&6
     7252else
     7253  if test -n "$ac_ct_DSYMUTIL"; then
     7254  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
     7255else
     7256as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7257for as_dir in $PATH
     7258do
     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
     7267done
     7268done
     7269IFS=$as_save_IFS
     7270
     7271fi
     7272fi
     7273ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
     7274if test -n "$ac_ct_DSYMUTIL"; then
     7275  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
     7276echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
     7277else
     7278  { echo "$as_me:$LINENO: result: no" >&5
     7279echo "${ECHO_T}no" >&6; }
     7280fi
     7281
     7282  if test "x$ac_ct_DSYMUTIL" = x; then
     7283    DSYMUTIL=":"
     7284  else
     7285    case $cross_compiling:$ac_tool_warned in
     7286yes:)
     7287{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
     7288whose name does not start with the host triplet.  If you think this
     7289configuration is useful to you, please write to autoconf@gnu.org." >&5
     7290echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
     7291whose name does not start with the host triplet.  If you think this
     7292configuration is useful to you, please write to autoconf@gnu.org." >&2;}
     7293ac_tool_warned=yes ;;
     7294esac
     7295    DSYMUTIL=$ac_ct_DSYMUTIL
     7296  fi
     7297else
     7298  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
     7299fi
     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.
     7303set dummy ${ac_tool_prefix}nmedit; ac_word=$2
     7304{ echo "$as_me:$LINENO: checking for $ac_word" >&5
     7305echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
     7306if test "${ac_cv_prog_NMEDIT+set}" = set; then
     7307  echo $ECHO_N "(cached) $ECHO_C" >&6
     7308else
     7309  if test -n "$NMEDIT"; then
     7310  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
     7311else
     7312as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7313for as_dir in $PATH
     7314do
     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
     7323done
     7324done
     7325IFS=$as_save_IFS
     7326
     7327fi
     7328fi
     7329NMEDIT=$ac_cv_prog_NMEDIT
     7330if test -n "$NMEDIT"; then
     7331  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
     7332echo "${ECHO_T}$NMEDIT" >&6; }
     7333else
     7334  { echo "$as_me:$LINENO: result: no" >&5
     7335echo "${ECHO_T}no" >&6; }
     7336fi
     7337
     7338
     7339fi
     7340if 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.
     7343set dummy nmedit; ac_word=$2
     7344{ echo "$as_me:$LINENO: checking for $ac_word" >&5
     7345echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
     7346if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
     7347  echo $ECHO_N "(cached) $ECHO_C" >&6
     7348else
     7349  if test -n "$ac_ct_NMEDIT"; then
     7350  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
     7351else
     7352as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7353for as_dir in $PATH
     7354do
     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
     7363done
     7364done
     7365IFS=$as_save_IFS
     7366
     7367fi
     7368fi
     7369ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
     7370if test -n "$ac_ct_NMEDIT"; then
     7371  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
     7372echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
     7373else
     7374  { echo "$as_me:$LINENO: result: no" >&5
     7375echo "${ECHO_T}no" >&6; }
     7376fi
     7377
     7378  if test "x$ac_ct_NMEDIT" = x; then
     7379    NMEDIT=":"
     7380  else
     7381    case $cross_compiling:$ac_tool_warned in
     7382yes:)
     7383{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
     7384whose name does not start with the host triplet.  If you think this
     7385configuration is useful to you, please write to autoconf@gnu.org." >&5
     7386echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
     7387whose name does not start with the host triplet.  If you think this
     7388configuration is useful to you, please write to autoconf@gnu.org." >&2;}
     7389ac_tool_warned=yes ;;
     7390esac
     7391    NMEDIT=$ac_ct_NMEDIT
     7392  fi
     7393else
     7394  NMEDIT="$ac_cv_prog_NMEDIT"
     7395fi
     7396
     7397
     7398    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
     7399echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
     7400if test "${lt_cv_apple_cc_single_mod+set}" = set; then
     7401  echo $ECHO_N "(cached) $ECHO_C" >&6
     7402else
     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
     7418fi
     7419{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
     7420echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
     7421    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
     7422echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
     7423if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
     7424  echo $ECHO_N "(cached) $ECHO_C" >&6
     7425else
     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
     7433cat confdefs.h >>conftest.$ac_ext
     7434cat >>conftest.$ac_ext <<_ACEOF
     7435/* end confdefs.h.  */
     7436
     7437int
     7438main ()
     7439{
     7440
     7441  ;
     7442  return 0;
     7443}
     7444_ACEOF
     7445rm -f conftest.$ac_objext conftest$ac_exeext
     7446if { (ac_try="$ac_link"
     7447case "(($ac_try" in
     7448  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
     7449  *) ac_try_echo=$ac_try;;
     7450esac
     7451eval "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
     7464else
     7465  echo "$as_me: failed program was:" >&5
     7466sed 's/^/| /' conftest.$ac_ext >&5
     7467
     7468        lt_cv_ld_exported_symbols_list=no
     7469fi
     7470
     7471rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     7472      conftest$ac_exeext conftest.$ac_ext
     7473   LDFLAGS="$save_LDFLAGS"
     7474
     7475fi
     7476{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
     7477echo "${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
    71997514enable_dlopen=no
    72007515enable_win32_dll=no
     
    72627577eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
    72637578_lt_linker_boilerplate=`cat conftest.err`
    7264 $rm conftest*
     7579$rm -r conftest*
    72657580
    72667581
     
    72907605   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    72917606   -e 's:$: $lt_compiler_flag:'`
    7292    (eval echo "\"\$as_me:7292: $lt_compile\"" >&5)
     7607   (eval echo "\"\$as_me:7607: $lt_compile\"" >&5)
    72937608   (eval "$lt_compile" 2>conftest.err)
    72947609   ac_status=$?
    72957610   cat conftest.err >&5
    7296    echo "$as_me:7296: \$? = $ac_status" >&5
     7611   echo "$as_me:7611: \$? = $ac_status" >&5
    72977612   if (exit $ac_status) && test -s "$ac_outfile"; then
    72987613     # The compiler can only warn and ignore the option if not recognized
     
    75647879{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
    75657880echo $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; then
     7881if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
    75677882  echo $ECHO_N "(cached) $ECHO_C" >&6
    75687883else
    7569   lt_prog_compiler_pic_works=no
     7884  lt_cv_prog_compiler_pic_works=no
    75707885  ac_outfile=conftest.$ac_objext
    75717886   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
     
    75807895   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    75817896   -e 's:$: $lt_compiler_flag:'`
    7582    (eval echo "\"\$as_me:7582: $lt_compile\"" >&5)
     7897   (eval echo "\"\$as_me:7897: $lt_compile\"" >&5)
    75837898   (eval "$lt_compile" 2>conftest.err)
    75847899   ac_status=$?
    75857900   cat conftest.err >&5
    7586    echo "$as_me:7586: \$? = $ac_status" >&5
     7901   echo "$as_me:7901: \$? = $ac_status" >&5
    75877902   if (exit $ac_status) && test -s "$ac_outfile"; then
    75887903     # The compiler can only warn and ignore the option if not recognized
     
    75917906     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    75927907     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
    7593        lt_prog_compiler_pic_works=yes
     7908       lt_cv_prog_compiler_pic_works=yes
    75947909     fi
    75957910   fi
     
    75977912
    75987913fi
    7599 { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
    7600 echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
    7601 
    7602 if test x"$lt_prog_compiler_pic_works" = xyes; then
     7914{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
     7915echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
     7916
     7917if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
    76037918    case $lt_prog_compiler_pic in
    76047919     "" | " "*) ;;
     
    76277942{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
    76287943echo $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; then
     7944if test "${lt_cv_prog_compiler_static_works+set}" = set; then
    76307945  echo $ECHO_N "(cached) $ECHO_C" >&6
    76317946else
    7632   lt_prog_compiler_static_works=no
     7947  lt_cv_prog_compiler_static_works=no
    76337948   save_LDFLAGS="$LDFLAGS"
    76347949   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
     
    76437958       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    76447959       if diff conftest.exp conftest.er2 >/dev/null; then
    7645          lt_prog_compiler_static_works=yes
     7960         lt_cv_prog_compiler_static_works=yes
    76467961       fi
    76477962     else
    7648        lt_prog_compiler_static_works=yes
     7963       lt_cv_prog_compiler_static_works=yes
    76497964     fi
    76507965   fi
    7651    $rm conftest*
     7966   $rm -r conftest*
    76527967   LDFLAGS="$save_LDFLAGS"
    76537968
    76547969fi
    7655 { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
    7656 echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
    7657 
    7658 if test x"$lt_prog_compiler_static_works" = xyes; then
     7970{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
     7971echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
     7972
     7973if test x"$lt_cv_prog_compiler_static_works" = xyes; then
    76597974    :
    76607975else
     
    76847999   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76858000   -e 's:$: $lt_compiler_flag:'`
    7686    (eval echo "\"\$as_me:7686: $lt_compile\"" >&5)
     8001   (eval echo "\"\$as_me:8001: $lt_compile\"" >&5)
    76878002   (eval "$lt_compile" 2>out/conftest.err)
    76888003   ac_status=$?
    76898004   cat out/conftest.err >&5
    7690    echo "$as_me:7690: \$? = $ac_status" >&5
     8005   echo "$as_me:8005: \$? = $ac_status" >&5
    76918006   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    76928007   then
     
    77688083  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    77698084  # as well as any symbol that contains `d'.
    7770   exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
     8085  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
    77718086  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
    77728087  # platforms (ab)use it in PIC code, but their linkers get confused if
     
    77748089  # rely on this symbol name, it's probably fine to never include it in
    77758090  # preloaded symbol tables.
     8091  # Exclude shared library initialization/finalization symbols.
    77768092  extract_expsyms_cmds=
    77778093  # Just being paranoid about ensuring that cc_basename is set.
     
    78328148    # See if GNU ld supports shared libraries.
    78338149    case $host_os in
    7834     aix3* | aix4* | aix5*)
     8150    aix[3-9]*)
    78358151      # On AIX/PPC, the GNU linker is very broken
    78368152      if test "$host_cpu" != ia64; then
     
    80528368      ;;
    80538369
    8054     aix4* | aix5*)
     8370    aix[4-9]*)
    80558371      if test "$host_cpu" = ia64; then
    80568372        # On IA64, the linker does run time linking by default, so we don't
     
    80728388        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
    80738389        # need to do runtime linking.
    8074         case $host_os in aix4.[23]|aix4.[23].*|aix5*)
     8390        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
    80758391          for ld_flag in $LDFLAGS; do
    80768392          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
     
    83448660    if test "$GCC" = yes ; then
    83458661        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}"
    83518666    else
    83528667      case $cc_basename in
     
    88689183  ;;
    88699184
    8870 aix4* | aix5*)
     9185aix[4-9]*)
    88719186  version_type=linux
    88729187  need_lib_prefix=no
     
    94029717test "$dynamic_linker" = no && can_build_shared=no
    94039718
     9719if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
     9720  echo $ECHO_N "(cached) $ECHO_C" >&6
     9721else
     9722  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
     9723fi
     9724
     9725sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
     9726if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
     9727  echo $ECHO_N "(cached) $ECHO_C" >&6
     9728else
     9729  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
     9730fi
     9731
     9732sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
     9733
    94049734variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
    94059735if test "$GCC" = yes; then
     
    972110051echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
    972210052if 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"
    972410054else
    972510055  { echo "$as_me:$LINENO: checking for dlopen" >&5
     
    999710327echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
    999810328if 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"
    1000010330fi
    1000110331
     
    1004610376  lt_status=$lt_dlunknown
    1004710377  cat > conftest.$ac_ext <<EOF
    10048 #line 10048 "configure"
     10378#line 10378 "configure"
    1004910379#include "confdefs.h"
    1005010380
     
    1014610476  lt_status=$lt_dlunknown
    1014710477  cat > conftest.$ac_ext <<EOF
    10148 #line 10148 "configure"
     10478#line 10478 "configure"
    1014910479#include "confdefs.h"
    1015010480
     
    1027310603  ;;
    1027410604
    10275 aix4* | aix5*)
     10605aix[4-9]*)
    1027610606  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
    1027710607    test "$enable_shared" = yes && enable_static=no
     
    1032910659    postdeps \
    1033010660    compiler_lib_search_path \
     10661    compiler_lib_search_dirs \
    1033110662    archive_cmds \
    1033210663    archive_expsym_cmds \
     
    1038910720# NOTE: Changes made to this file will be lost: look at ltmain.sh.
    1039010721#
    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
    1039210723# Free Software Foundation, Inc.
    1039310724#
     
    1062510956postdeps=$lt_postdeps
    1062610957
     10958# The directories searched by this compiler when creating a shared
     10959# library
     10960compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
     10961
    1062710962# The library search path used internally by the compiler when linking
    1062810963# a shared library.
     
    1087311208postdeps_CXX=
    1087411209compiler_lib_search_path_CXX=
     11210compiler_lib_search_dirs_CXX=
    1087511211
    1087611212# Source file extension for C++ test sources.
     
    1091011246eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
    1091111247_lt_linker_boilerplate=`cat conftest.err`
    10912 $rm conftest*
     11248$rm -r conftest*
    1091311249
    1091411250
     
    1111711453    ld_shlibs_CXX=no
    1111811454    ;;
    11119   aix4* | aix5*)
     11455  aix[4-9]*)
    1112011456    if test "$host_cpu" = ia64; then
    1112111457      # On IA64, the linker does run time linking by default, so we don't
     
    1113011466      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
    1113111467      # need to do runtime linking.
    11132       case $host_os in aix4.[23]|aix4.[23].*|aix5*)
     11468      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
    1113311469        for ld_flag in $LDFLAGS; do
    1113411470          case $ld_flag in
     
    1138811724  ;;
    1138911725      darwin* | rhapsody*)
    11390         case $host_os in
    11391         rhapsody* | darwin1.[012])
    11392          allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
    11393          ;;
    11394        *) # Darwin 1.3 on
    11395          if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
    11396            allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
    11397          else
    11398            case ${MACOSX_DEPLOYMENT_TARGET} in
    11399              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            esac
    11406          fi
    11407          ;;
    11408         esac
    1140911726      archive_cmds_need_lc_CXX=no
    1141011727      hardcode_direct_CXX=no
     
    1141311730      whole_archive_flag_spec_CXX=''
    1141411731      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
    1141811734      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}"
    1142111742      fi
    11422       if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
    11423        archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
    11424       else
    11425           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         fi
    11427         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 lds
    11429           if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
    11430             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           else
    11432             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           fi
    11434             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}'
    1143511743      else
    1143611744      case $cc_basename in
     
    1168311991        whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
    1168411992        ;;
    11685       pgCC*)
     11993      pgCC* | pgcpp*)
    1168611994        # Portland Group C++ compiler
    1168711995        archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
     
    1209012398LD_CXX="$LD"
    1209112399
    12092 
    1209312400cat > conftest.$ac_ext <<EOF
    1209412401class Foo
     
    1219212499$rm -f confest.$objext
    1219312500
     12501compiler_lib_search_dirs_CXX=
     12502if 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!^ !!'`
     12504fi
     12505
    1219412506# PORTME: override above test on systems where it is broken
    1219512507case $host_os in
     
    1224712559esac
    1224812560
    12249 
    1225012561case " $postdeps_CXX " in
    1225112562*" -lc "*) archive_cmds_need_lc_CXX=no ;;
     
    1232312634  else
    1232412635    case $host_os in
    12325       aix4* | aix5*)
     12636      aix[4-9]*)
    1232612637        # All AIX code is PIC.
    1232712638        if test "$host_cpu" = ia64; then
     
    1241912730            lt_prog_compiler_static_CXX='-static'
    1242012731            ;;
    12421           pgCC*)
     12732          pgCC* | pgcpp*)
    1242212733            # Portland Group C++ compiler.
    1242312734            lt_prog_compiler_wl_CXX='-Wl,'
     
    1255012861{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
    1255112862echo $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; then
     12863if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
    1255312864  echo $ECHO_N "(cached) $ECHO_C" >&6
    1255412865else
    12555   lt_prog_compiler_pic_works_CXX=no
     12866  lt_cv_prog_compiler_pic_works_CXX=no
    1255612867  ac_outfile=conftest.$ac_objext
    1255712868   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
     
    1256612877   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1256712878   -e 's:$: $lt_compiler_flag:'`
    12568    (eval echo "\"\$as_me:12568: $lt_compile\"" >&5)
     12879   (eval echo "\"\$as_me:12879: $lt_compile\"" >&5)
    1256912880   (eval "$lt_compile" 2>conftest.err)
    1257012881   ac_status=$?
    1257112882   cat conftest.err >&5
    12572    echo "$as_me:12572: \$? = $ac_status" >&5
     12883   echo "$as_me:12883: \$? = $ac_status" >&5
    1257312884   if (exit $ac_status) && test -s "$ac_outfile"; then
    1257412885     # The compiler can only warn and ignore the option if not recognized
     
    1257712888     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    1257812889     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
    12579        lt_prog_compiler_pic_works_CXX=yes
     12890       lt_cv_prog_compiler_pic_works_CXX=yes
    1258012891     fi
    1258112892   fi
     
    1258312894
    1258412895fi
    12585 { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
    12586 echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
    12587 
    12588 if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
     12896{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
     12897echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
     12898
     12899if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
    1258912900    case $lt_prog_compiler_pic_CXX in
    1259012901     "" | " "*) ;;
     
    1261312924{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
    1261412925echo $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; then
     12926if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
    1261612927  echo $ECHO_N "(cached) $ECHO_C" >&6
    1261712928else
    12618   lt_prog_compiler_static_works_CXX=no
     12929  lt_cv_prog_compiler_static_works_CXX=no
    1261912930   save_LDFLAGS="$LDFLAGS"
    1262012931   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
     
    1262912940       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    1263012941       if diff conftest.exp conftest.er2 >/dev/null; then
    12631          lt_prog_compiler_static_works_CXX=yes
     12942         lt_cv_prog_compiler_static_works_CXX=yes
    1263212943       fi
    1263312944     else
    12634        lt_prog_compiler_static_works_CXX=yes
     12945       lt_cv_prog_compiler_static_works_CXX=yes
    1263512946     fi
    1263612947   fi
    12637    $rm conftest*
     12948   $rm -r conftest*
    1263812949   LDFLAGS="$save_LDFLAGS"
    1263912950
    1264012951fi
    12641 { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
    12642 echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
    12643 
    12644 if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
     12952{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
     12953echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
     12954
     12955if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
    1264512956    :
    1264612957else
     
    1267012981   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1267112982   -e 's:$: $lt_compiler_flag:'`
    12672    (eval echo "\"\$as_me:12672: $lt_compile\"" >&5)
     12983   (eval echo "\"\$as_me:12983: $lt_compile\"" >&5)
    1267312984   (eval "$lt_compile" 2>out/conftest.err)
    1267412985   ac_status=$?
    1267512986   cat out/conftest.err >&5
    12676    echo "$as_me:12676: \$? = $ac_status" >&5
     12987   echo "$as_me:12987: \$? = $ac_status" >&5
    1267712988   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1267812989   then
     
    1272713038  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    1272813039  case $host_os in
    12729   aix4* | aix5*)
     13040  aix[4-9]*)
    1273013041    # If we're using GNU nm, then we don't want the "-C" option.
    1273113042    # -C means demangle to AIX nm, but means don't demangle with GNU nm
     
    1274913060  ;;
    1275013061  esac
     13062  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
    1275113063
    1275213064{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
     
    1285013162  ;;
    1285113163
    12852 aix4* | aix5*)
     13164aix[4-9]*)
    1285313165  version_type=linux
    1285413166  need_lib_prefix=no
     
    1338313695test "$dynamic_linker" = no && can_build_shared=no
    1338413696
     13697if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
     13698  echo $ECHO_N "(cached) $ECHO_C" >&6
     13699else
     13700  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
     13701fi
     13702
     13703sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
     13704if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
     13705  echo $ECHO_N "(cached) $ECHO_C" >&6
     13706else
     13707  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
     13708fi
     13709
     13710sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
     13711
    1338513712variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
    1338613713if test "$GCC" = yes; then
     
    1346613793    postdeps_CXX \
    1346713794    compiler_lib_search_path_CXX \
     13795    compiler_lib_search_dirs_CXX \
    1346813796    archive_cmds_CXX \
    1346913797    archive_expsym_cmds_CXX \
     
    1371414042postdeps=$lt_postdeps_CXX
    1371514043
     14044# The directories searched by this compiler when creating a shared
     14045# library
     14046compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
     14047
    1371614048# The library search path used internally by the compiler when linking
    1371714049# a shared library.
     
    1392814260eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
    1392914261_lt_linker_boilerplate=`cat conftest.err`
    13930 $rm conftest*
     14262$rm -r conftest*
    1393114263
    1393214264
     
    1396614298  fi
    1396714299  ;;
    13968 aix4* | aix5*)
     14300aix[4-9]*)
    1396914301  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
    1397014302    test "$enable_shared" = yes && enable_static=no
     
    1423114563{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
    1423214564echo $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; then
     14565if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
    1423414566  echo $ECHO_N "(cached) $ECHO_C" >&6
    1423514567else
    14236   lt_prog_compiler_pic_works_F77=no
     14568  lt_cv_prog_compiler_pic_works_F77=no
    1423714569  ac_outfile=conftest.$ac_objext
    1423814570   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
     
    1424714579   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1424814580   -e 's:$: $lt_compiler_flag:'`
    14249    (eval echo "\"\$as_me:14249: $lt_compile\"" >&5)
     14581   (eval echo "\"\$as_me:14581: $lt_compile\"" >&5)
    1425014582   (eval "$lt_compile" 2>conftest.err)
    1425114583   ac_status=$?
    1425214584   cat conftest.err >&5
    14253    echo "$as_me:14253: \$? = $ac_status" >&5
     14585   echo "$as_me:14585: \$? = $ac_status" >&5
    1425414586   if (exit $ac_status) && test -s "$ac_outfile"; then
    1425514587     # The compiler can only warn and ignore the option if not recognized
     
    1425814590     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    1425914591     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
    14260        lt_prog_compiler_pic_works_F77=yes
     14592       lt_cv_prog_compiler_pic_works_F77=yes
    1426114593     fi
    1426214594   fi
     
    1426414596
    1426514597fi
    14266 { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
    14267 echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
    14268 
    14269 if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
     14598{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
     14599echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
     14600
     14601if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
    1427014602    case $lt_prog_compiler_pic_F77 in
    1427114603     "" | " "*) ;;
     
    1429414626{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
    1429514627echo $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; then
     14628if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
    1429714629  echo $ECHO_N "(cached) $ECHO_C" >&6
    1429814630else
    14299   lt_prog_compiler_static_works_F77=no
     14631  lt_cv_prog_compiler_static_works_F77=no
    1430014632   save_LDFLAGS="$LDFLAGS"
    1430114633   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
     
    1431014642       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    1431114643       if diff conftest.exp conftest.er2 >/dev/null; then
    14312          lt_prog_compiler_static_works_F77=yes
     14644         lt_cv_prog_compiler_static_works_F77=yes
    1431314645       fi
    1431414646     else
    14315        lt_prog_compiler_static_works_F77=yes
     14647       lt_cv_prog_compiler_static_works_F77=yes
    1431614648     fi
    1431714649   fi
    14318    $rm conftest*
     14650   $rm -r conftest*
    1431914651   LDFLAGS="$save_LDFLAGS"
    1432014652
    1432114653fi
    14322 { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
    14323 echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
    14324 
    14325 if test x"$lt_prog_compiler_static_works_F77" = xyes; then
     14654{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
     14655echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
     14656
     14657if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
    1432614658    :
    1432714659else
     
    1435114683   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1435214684   -e 's:$: $lt_compiler_flag:'`
    14353    (eval echo "\"\$as_me:14353: $lt_compile\"" >&5)
     14685   (eval echo "\"\$as_me:14685: $lt_compile\"" >&5)
    1435414686   (eval "$lt_compile" 2>out/conftest.err)
    1435514687   ac_status=$?
    1435614688   cat out/conftest.err >&5
    14357    echo "$as_me:14357: \$? = $ac_status" >&5
     14689   echo "$as_me:14689: \$? = $ac_status" >&5
    1435814690   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1435914691   then
     
    1443514767  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    1443614768  # 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]_.*'
    1443814770  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
    1443914771  # platforms (ab)use it in PIC code, but their linkers get confused if
     
    1444114773  # rely on this symbol name, it's probably fine to never include it in
    1444214774  # preloaded symbol tables.
     14775  # Exclude shared library initialization/finalization symbols.
    1444314776  extract_expsyms_cmds=
    1444414777  # Just being paranoid about ensuring that cc_basename is set.
     
    1449914832    # See if GNU ld supports shared libraries.
    1450014833    case $host_os in
    14501     aix3* | aix4* | aix5*)
     14834    aix[3-9]*)
    1450214835      # On AIX/PPC, the GNU linker is very broken
    1450314836      if test "$host_cpu" != ia64; then
     
    1471915052      ;;
    1472015053
    14721     aix4* | aix5*)
     15054    aix[4-9]*)
    1472215055      if test "$host_cpu" = ia64; then
    1472315056        # On IA64, the linker does run time linking by default, so we don't
     
    1473915072        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
    1474015073        # need to do runtime linking.
    14741         case $host_os in aix4.[23]|aix4.[23].*|aix5*)
     15074        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
    1474215075          for ld_flag in $LDFLAGS; do
    1474315076          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
     
    1499115324    if test "$GCC" = yes ; then
    1499215325        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}"
    1499815330    else
    1499915331      case $cc_basename in
     
    1546415796  ;;
    1546515797
    15466 aix4* | aix5*)
     15798aix[4-9]*)
    1546715799  version_type=linux
    1546815800  need_lib_prefix=no
     
    1599716329test "$dynamic_linker" = no && can_build_shared=no
    1599816330
     16331if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
     16332  echo $ECHO_N "(cached) $ECHO_C" >&6
     16333else
     16334  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
     16335fi
     16336
     16337sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
     16338if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
     16339  echo $ECHO_N "(cached) $ECHO_C" >&6
     16340else
     16341  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
     16342fi
     16343
     16344sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
     16345
    1599916346variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
    1600016347if test "$GCC" = yes; then
     
    1608016427    postdeps_F77 \
    1608116428    compiler_lib_search_path_F77 \
     16429    compiler_lib_search_dirs_F77 \
    1608216430    archive_cmds_F77 \
    1608316431    archive_expsym_cmds_F77 \
     
    1632816676postdeps=$lt_postdeps_F77
    1632916677
     16678# The directories searched by this compiler when creating a shared
     16679# library
     16680compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
     16681
    1633016682# The library search path used internally by the compiler when linking
    1633116683# a shared library.
     
    1650216854eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
    1650316855_lt_linker_boilerplate=`cat conftest.err`
    16504 $rm conftest*
     16856$rm -r conftest*
    1650516857
    1650616858
     
    1655116903   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1655216904   -e 's:$: $lt_compiler_flag:'`
    16553    (eval echo "\"\$as_me:16553: $lt_compile\"" >&5)
     16905   (eval echo "\"\$as_me:16905: $lt_compile\"" >&5)
    1655416906   (eval "$lt_compile" 2>conftest.err)
    1655516907   ac_status=$?
    1655616908   cat conftest.err >&5
    16557    echo "$as_me:16557: \$? = $ac_status" >&5
     16909   echo "$as_me:16909: \$? = $ac_status" >&5
    1655816910   if (exit $ac_status) && test -s "$ac_outfile"; then
    1655916911     # The compiler can only warn and ignore the option if not recognized
     
    1661516967      # Although the cygwin gcc ignores -fPIC, still need this for old-style
    1661616968      # (--disable-auto-import) libraries
    16617       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
     16969
    1661816970      ;;
    1661916971
     
    1668517037      # This hack is so that the source file can tell whether it is being
    1668617038      # built for inclusion in a dll (and should export symbols for example).
    16687       lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
     17039
    1668817040      ;;
    1668917041
     
    1682517177{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
    1682617178echo $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; then
     17179if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
    1682817180  echo $ECHO_N "(cached) $ECHO_C" >&6
    1682917181else
    16830   lt_prog_compiler_pic_works_GCJ=no
     17182  lt_cv_prog_compiler_pic_works_GCJ=no
    1683117183  ac_outfile=conftest.$ac_objext
    1683217184   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
     
    1684117193   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1684217194   -e 's:$: $lt_compiler_flag:'`
    16843    (eval echo "\"\$as_me:16843: $lt_compile\"" >&5)
     17195   (eval echo "\"\$as_me:17195: $lt_compile\"" >&5)
    1684417196   (eval "$lt_compile" 2>conftest.err)
    1684517197   ac_status=$?
    1684617198   cat conftest.err >&5
    16847    echo "$as_me:16847: \$? = $ac_status" >&5
     17199   echo "$as_me:17199: \$? = $ac_status" >&5
    1684817200   if (exit $ac_status) && test -s "$ac_outfile"; then
    1684917201     # The compiler can only warn and ignore the option if not recognized
     
    1685217204     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    1685317205     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
    16854        lt_prog_compiler_pic_works_GCJ=yes
     17206       lt_cv_prog_compiler_pic_works_GCJ=yes
    1685517207     fi
    1685617208   fi
     
    1685817210
    1685917211fi
    16860 { echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
    16861 echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
    16862 
    16863 if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
     17212{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
     17213echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
     17214
     17215if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
    1686417216    case $lt_prog_compiler_pic_GCJ in
    1686517217     "" | " "*) ;;
     
    1688817240{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
    1688917241echo $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; then
     17242if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
    1689117243  echo $ECHO_N "(cached) $ECHO_C" >&6
    1689217244else
    16893   lt_prog_compiler_static_works_GCJ=no
     17245  lt_cv_prog_compiler_static_works_GCJ=no
    1689417246   save_LDFLAGS="$LDFLAGS"
    1689517247   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
     
    1690417256       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
    1690517257       if diff conftest.exp conftest.er2 >/dev/null; then
    16906          lt_prog_compiler_static_works_GCJ=yes
     17258         lt_cv_prog_compiler_static_works_GCJ=yes
    1690717259       fi
    1690817260     else
    16909        lt_prog_compiler_static_works_GCJ=yes
     17261       lt_cv_prog_compiler_static_works_GCJ=yes
    1691017262     fi
    1691117263   fi
    16912    $rm conftest*
     17264   $rm -r conftest*
    1691317265   LDFLAGS="$save_LDFLAGS"
    1691417266
    1691517267fi
    16916 { echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
    16917 echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
    16918 
    16919 if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
     17268{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
     17269echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
     17270
     17271if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
    1692017272    :
    1692117273else
     
    1694517297   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1694617298   -e 's:$: $lt_compiler_flag:'`
    16947    (eval echo "\"\$as_me:16947: $lt_compile\"" >&5)
     17299   (eval echo "\"\$as_me:17299: $lt_compile\"" >&5)
    1694817300   (eval "$lt_compile" 2>out/conftest.err)
    1694917301   ac_status=$?
    1695017302   cat out/conftest.err >&5
    16951    echo "$as_me:16951: \$? = $ac_status" >&5
     17303   echo "$as_me:17303: \$? = $ac_status" >&5
    1695217304   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1695317305   then
     
    1702917381  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    1703017382  # 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]_.*'
    1703217384  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
    1703317385  # platforms (ab)use it in PIC code, but their linkers get confused if
     
    1703517387  # rely on this symbol name, it's probably fine to never include it in
    1703617388  # preloaded symbol tables.
     17389  # Exclude shared library initialization/finalization symbols.
    1703717390  extract_expsyms_cmds=
    1703817391  # Just being paranoid about ensuring that cc_basename is set.
     
    1709317446    # See if GNU ld supports shared libraries.
    1709417447    case $host_os in
    17095     aix3* | aix4* | aix5*)
     17448    aix[3-9]*)
    1709617449      # On AIX/PPC, the GNU linker is very broken
    1709717450      if test "$host_cpu" != ia64; then
     
    1731317666      ;;
    1731417667
    17315     aix4* | aix5*)
     17668    aix[4-9]*)
    1731617669      if test "$host_cpu" = ia64; then
    1731717670        # On IA64, the linker does run time linking by default, so we don't
     
    1733317686        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
    1733417687        # need to do runtime linking.
    17335         case $host_os in aix4.[23]|aix4.[23].*|aix5*)
     17688        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
    1733617689          for ld_flag in $LDFLAGS; do
    1733717690          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
     
    1760517958    if test "$GCC" = yes ; then
    1760617959        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}"
    1761217964    else
    1761317965      case $cc_basename in
     
    1807818430  ;;
    1807918431
    18080 aix4* | aix5*)
     18432aix[4-9]*)
    1808118433  version_type=linux
    1808218434  need_lib_prefix=no
     
    1861118963test "$dynamic_linker" = no && can_build_shared=no
    1861218964
     18965if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
     18966  echo $ECHO_N "(cached) $ECHO_C" >&6
     18967else
     18968  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
     18969fi
     18970
     18971sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
     18972if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
     18973  echo $ECHO_N "(cached) $ECHO_C" >&6
     18974else
     18975  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
     18976fi
     18977
     18978sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
     18979
    1861318980variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
    1861418981if test "$GCC" = yes; then
     
    1869419061    postdeps_GCJ \
    1869519062    compiler_lib_search_path_GCJ \
     19063    compiler_lib_search_dirs_GCJ \
    1869619064    archive_cmds_GCJ \
    1869719065    archive_expsym_cmds_GCJ \
     
    1894219310postdeps=$lt_postdeps_GCJ
    1894319311
     19312# The directories searched by this compiler when creating a shared
     19313# library
     19314compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
     19315
    1894419316# The library search path used internally by the compiler when linking
    1894519317# a shared library.
     
    1911519487eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
    1911619488_lt_linker_boilerplate=`cat conftest.err`
    19117 $rm conftest*
     19489$rm -r conftest*
    1911819490
    1911919491
     
    1917519547    postdeps_RC \
    1917619548    compiler_lib_search_path_RC \
     19549    compiler_lib_search_dirs_RC \
    1917719550    archive_cmds_RC \
    1917819551    archive_expsym_cmds_RC \
     
    1942219795# shared library.
    1942319796postdeps=$lt_postdeps_RC
     19797
     19798# The directories searched by this compiler when creating a shared
     19799# library
     19800compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
    1942419801
    1942519802# The library search path used internally by the compiler when linking
     
    2023420611
    2023520612
    20236 MIN_TLS_VERSION=2.2.1
    20237 
    20238 # Check whether --with-libgnutls-extra-prefix was given.
    20239 if test "${with_libgnutls_extra_prefix+set}" = set; then
    20240   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 ; then
    20247      if test x${LIBGNUTLS_EXTRA_CONFIG+set} != xset ; then
    20248         LIBGNUTLS_EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config
     20613MIN_TLS_VERSION=2.4.0
     20614
     20615# Check whether --with-libgnutls-prefix was given.
     20616if test "${with_libgnutls_prefix+set}" = set; then
     20617  withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval"
     20618else
     20619  libgnutls_config_prefix=""
     20620fi
     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
    2024920626     fi
    2025020627  fi
    2025120628
    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=$2
     20629  # Extract the first word of "libgnutls-config", so it can be a program name with args.
     20630set dummy libgnutls-config; ac_word=$2
    2025420631{ echo "$as_me:$LINENO: checking for $ac_word" >&5
    2025520632echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
    20256 if test "${ac_cv_path_LIBGNUTLS_EXTRA_CONFIG+set}" = set; then
     20633if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then
    2025720634  echo $ECHO_N "(cached) $ECHO_C" >&6
    2025820635else
    20259   case $LIBGNUTLS_EXTRA_CONFIG in
     20636  case $LIBGNUTLS_CONFIG in
    2026020637  [\\/]* | ?:[\\/]*)
    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.
    2026220639  ;;
    2026320640  *)
     
    2026920646  for ac_exec_ext in '' $ac_executable_extensions; do
    2027020647  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"
    2027220649    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    2027320650    break 2
     
    2027720654IFS=$as_save_IFS
    2027820655
    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"
    2028020657  ;;
    2028120658esac
    2028220659fi
    20283 LIBGNUTLS_EXTRA_CONFIG=$ac_cv_path_LIBGNUTLS_EXTRA_CONFIG
    20284 if test -n "$LIBGNUTLS_EXTRA_CONFIG"; then
    20285   { echo "$as_me:$LINENO: result: $LIBGNUTLS_EXTRA_CONFIG" >&5
    20286 echo "${ECHO_T}$LIBGNUTLS_EXTRA_CONFIG" >&6; }
     20660LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
     20661if test -n "$LIBGNUTLS_CONFIG"; then
     20662  { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5
     20663echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; }
    2028720664else
    2028820665  { echo "$as_me:$LINENO: result: no" >&5
     
    2029520672echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; }
    2029620673  no_libgnutls=""
    20297   if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
     20674  if test "$LIBGNUTLS_CONFIG" = "no" ; then
    2029820675    no_libgnutls=yes
    2029920676  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`
    2030320680
    2030420681
    2030520682      ac_save_CFLAGS="$CFLAGS"
    2030620683      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"
    2030920686      rm -f conf.libgnutlstest
    2031020687      if test "$cross_compiling" = yes; then
     
    2032120698#include <stdlib.h>
    2032220699#include <string.h>
    20323 #include <gnutls/extra.h>
     20700#include <gnutls/gnutls.h>
    2032420701
    2032520702int
     
    2032820705    system ("touch conf.libgnutlstest");
    2032920706
    20330     if( strcmp( gnutls_extra_check_version(NULL), "$libgnutls_extra_config_version" ) )
     20707    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
    2033120708    {
    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");
    2033620713      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
    2033720714      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
    2033820715      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");
    2034120718      printf("*** before re-running configure\n");
    2034220719    }
    20343     else if ( strcmp(gnutls_extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) )
     20720    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
    2034420721    {
    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) );
    2034820724    }
    2034920725    else
    2035020726    {
    20351       if ( gnutls_extra_check_version( "$min_libgnutls_version" ) )
     20727      if ( gnutls_check_version( "$min_libgnutls_version" ) )
    2035220728      {
    2035320729        return 0;
     
    2035520731     else
    2035620732      {
    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_EXTRA newer 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",
    2036020736               "$min_libgnutls_version" );
    20361         printf("*** LIBGNUTLS_EXTRA is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
     20737        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
    2036220738        printf("*** \n");
    2036320739        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");
    2036520741        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");
    2036820744        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
    2036920745        printf("*** so that the correct libraries are found at run-time))\n");
     
    2042220798echo "${ECHO_T}no" >&6; }
    2042320799     fi
    20424      if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
    20425        echo "*** The libgnutls-extra-config script installed by LIBGNUTLS_EXTRA could not be found"
    20426        echo "*** If LIBGNUTLS_EXTRA was 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."
    2042920805     else
    2043020806       if test -f conf.libgnutlstest ; then
     
    2043220808       else
    2043320809          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"
    2043620812          cat >conftest.$ac_ext <<_ACEOF
    2043720813/* confdefs.h.  */
     
    2044420820#include <stdlib.h>
    2044520821#include <string.h>
    20446 #include <gnutls/extra.h>
     20822#include <gnutls/gnutls.h>
    2044720823
    2044820824int
    2044920825main ()
    2045020826{
    20451  return !!gnutls_extra_check_version(NULL);
     20827 return !!gnutls_check_version(NULL);
    2045220828  ;
    2045320829  return 0;
     
    2047320849       $as_test_x conftest$ac_exeext; then
    2047420850   echo "*** The test program compiled, but did not run. This usually means"
    20475           echo "*** that the run-time linker is not finding LIBGNUTLS_EXTRA or 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"
    2047720853          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
    2047820854          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
     
    2048720863
    2048820864         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_EXTRA was incorrectly installed"
    20490           echo "*** or that you have moved LIBGNUTLS_EXTRA since 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"
    2049220868fi
    2049320869
     
    2049820874       fi
    2049920875     fi
    20500      LIBGNUTLS_EXTRA_CFLAGS=""
    20501      LIBGNUTLS_EXTRA_LIBS=""
     20876     LIBGNUTLS_CFLAGS=""
     20877     LIBGNUTLS_LIBS=""
    2050220878     { { echo "$as_me:$LINENO: error:
    2050320879***
    20504 *** libgnutls and libgnutls-extra were not found. You may want to get it from
     20880*** libgnutls was not found. You may want to get it from
    2050520881*** http://www.gnutls.org/
    2050620882***
     
    2050820884echo "$as_me: error:
    2050920885***
    20510 *** libgnutls and libgnutls-extra were not found. You may want to get it from
     20886*** libgnutls was not found. You may want to get it from
    2051120887*** http://www.gnutls.org/
    2051220888***
     
    2051620892  rm -f conf.libgnutlstest
    2051720893
    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`"
    2052420896  GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
    2052520897
     
    2055720929  withval=$with_apr_memcache_prefix; apr_memcache_prefix="$withval"
    2055820930else
    20559   apr_memcache_prefix="/usr"
     20931  :
    2056020932fi
    2056120933
     
    2056520937  withval=$with_apr_memcache_libs; apr_memcache_libs="$withval"
    2056620938else
    20567   apr_memcache_libs="$apr_memcache_prefix/lib"
    20568     :
     20939  :
    2056920940fi
    2057020941
     
    2057420945  withval=$with_apr_memcache_includes; apr_memcache_includes="$withval"
    2057520946else
    20576   apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0"
    20577     :
     20947  :
    2057820948fi
    2057920949
     
    2066421034  ;;
    2066521035
    20666 aix4* | aix5*)
     21036aix[4-9]*)
    2066721037  version_type=linux
    2066821038  need_lib_prefix=no
     
    2119821568test "$dynamic_linker" = no && can_build_shared=no
    2119921569
     21570if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
     21571  echo $ECHO_N "(cached) $ECHO_C" >&6
     21572else
     21573  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
     21574fi
     21575
     21576sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
     21577if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
     21578  echo $ECHO_N "(cached) $ECHO_C" >&6
     21579else
     21580  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
     21581fi
     21582
     21583sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
     21584
    2120021585variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
    2120121586if test "$GCC" = yes; then
     
    2120621591save_CFLAGS=$CFLAGS
    2120721592save_LDFLAGS=$LDFLAGS
    21208 CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS"
    21209 LDFLAGS="-L$apr_memcache_libs $LDFLAGS"
     21593
     21594if test -n "$apr_memcache_libs"; then
     21595    apr_memcache_libdir=$apr_memcache_libs
     21596elif test -n "$apr_memcache_prefix"; then
     21597    apr_memcache_libdir=$apr_memcache_prefix/lib
     21598fi
     21599if test -n "$apr_memcache_libdir"; then
     21600    LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
     21601fi
     21602
     21603if test -n "$apr_memcache_includes"; then
     21604    apr_memcache_includedir=$apr_memcache_includes
     21605elif test -n "$apr_memcache_prefix"; then
     21606    apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
     21607else
     21608    apr_memcache_includedir=$includedir/apr_memcache-0
     21609fi
     21610CFLAGS="-I$apr_memcache_includedir $CFLAGS"
     21611
    2121021612{ echo "$as_me:$LINENO: checking for apr_memcache_create in -lapr_memcache" >&5
    2121121613echo $ECHO_N "checking for apr_memcache_create in -lapr_memcache... $ECHO_C" >&6; }
     
    2127121673if test $ac_cv_lib_apr_memcache_apr_memcache_create = yes; then
    2127221674
    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"
    2127521680
    2127621681
     
    2172722132# values after options handling.
    2172822133ac_log="
    21729 This file was extended by mod_gnutls $as_me 0.5.1, which was
     22134This file was extended by mod_gnutls $as_me 0.5.2, which was
    2173022135generated by GNU Autoconf 2.61.  Invocation command line was
    2173122136
     
    2178022185cat >>$CONFIG_STATUS <<_ACEOF
    2178122186ac_cs_version="\\
    21782 mod_gnutls config.status 0.5.1
     22187mod_gnutls config.status 0.5.2
    2178322188configured by $0, generated by GNU Autoconf 2.61,
    2178422189  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
     
    2210122506AR!$AR$ac_delim
    2210222507RANLIB!$RANLIB$ac_delim
     22508DSYMUTIL!$DSYMUTIL$ac_delim
     22509NMEDIT!$NMEDIT$ac_delim
    2210322510CPP!$CPP$ac_delim
    2210422511CXX!$CXX$ac_delim
     
    2213722544APXS_EXTENSION!$APXS_EXTENSION$ac_delim
    2213822545APXS_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
     22546LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim
    2214222547LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim
    2214322548LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim
     
    2255522960  rm -f "$tmp/out12"
    2255622961# Compute $ac_file's index in $config_headers.
     22962_am_arg=$ac_file
    2255722963_am_stamp_count=1
    2255822964for _am_header in $config_headers :; do
    2255922965  case $_am_header in
    22560     $ac_file | $ac_file:* )
     22966    $_am_arg | $_am_arg:* )
    2256122967      break ;;
    2256222968    * )
     
    2256422970  esac
    2256522971done
    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 |
     22972echo "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 ||
     22977echo X"$_am_arg" |
    2257222978    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
    2257322979            s//\1/
     
    2260623012  # Grep'ing the whole file is not good either: AIX grep has a line
    2260723013  # 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; then
     23014  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
    2260923015    dirpart=`$as_dirname -- "$mf" ||
    2261023016$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  • configure.ac

    r9d9b093 r8ce897a  
    11dnl
    2 AC_INIT(mod_gnutls, 0.5.1)
     2AC_INIT(mod_gnutls, 0.5.2)
    33OOO_CONFIG_NICE(config.nice)
    44MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
     
    2929dnl AC_SUBST(LIBTOOL)
    3030
    31 MIN_TLS_VERSION=2.2.1
    32 AM_PATH_LIBGNUTLS_EXTRA($MIN_TLS_VERSION,,
     31MIN_TLS_VERSION=2.4.0
     32AM_PATH_LIBGNUTLS($MIN_TLS_VERSION,,
    3333        AC_MSG_ERROR([[
    3434*** 
    35 *** libgnutls and libgnutls-extra were not found. You may want to get it from
     35*** libgnutls was not found. You may want to get it from
    3636*** http://www.gnutls.org/
    3737***
  • m4/apr_memcache.m4

    r9d9b093 r8ce897a  
    1010    [AC_HELP_STRING([--with-apr-memcache-prefix=PATH],[Install prefix for apr_memcache])],
    1111    apr_memcache_prefix="$withval",
    12     apr_memcache_prefix="/usr",
    1312    :)
    1413AC_ARG_WITH(
     
    1615    [AC_HELP_STRING([--with-apr-memcache-libs=PATH],[Path to apr_memcache libs])],
    1716    apr_memcache_libs="$withval",
    18     apr_memcache_libs="$apr_memcache_prefix/lib"
    1917    :)
    2018AC_ARG_WITH(
     
    2220    [AC_HELP_STRING([--with-apr-memcache-includes=PATH],[Path to apr_memcache includes])],
    2321    apr_memcache_includes="$withval",
    24     apr_memcache_includes="$apr_memcache_prefix/include/apr_memcache-0"
    2522    :)
    2623
     
    3128save_CFLAGS=$CFLAGS
    3229save_LDFLAGS=$LDFLAGS
    33 CFLAGS="-I$apr_memcache_includes $APR_INCLUDES $CFLAGS"
    34 LDFLAGS="-L$apr_memcache_libs $LDFLAGS"
     30
     31if test -n "$apr_memcache_libs"; then
     32    apr_memcache_libdir=$apr_memcache_libs
     33elif test -n "$apr_memcache_prefix"; then
     34    apr_memcache_libdir=$apr_memcache_prefix/lib
     35fi
     36if test -n "$apr_memcache_libdir"; then
     37    LDFLAGS="-L$apr_memcache_libdir $LDFLAGS"
     38fi
     39
     40if test -n "$apr_memcache_includes"; then
     41    apr_memcache_includedir=$apr_memcache_includes
     42elif test -n "$apr_memcache_prefix"; then
     43    apr_memcache_includedir=$apr_memcache_prefix/include/apr_memcache-0
     44else
     45    apr_memcache_includedir=$includedir/apr_memcache-0
     46fi
     47CFLAGS="-I$apr_memcache_includedir $CFLAGS"
     48
    3549AC_CHECK_LIB(
    3650    apr_memcache,
    3751    apr_memcache_create,
    3852    [
    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"
    4158    ]
    4259)
  • m4/libgnutls.m4

    r9d9b093 r8ce897a  
    1 dnl Autoconf macros for libgnutls-extra
     1dnl Autoconf macros for libgnutls
    22dnl $id$
    33
    4 # Modified for LIBGNUTLS_EXTRA -- nmav
     4# Modified for LIBGNUTLS -- nmav
    55# Configure paths for LIBGCRYPT
    66# Shamelessly stolen from the one of XDELTA by Owen Taylor
    77# Werner Koch   99-12-09
    88
    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_LIBS
     9dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
     10dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
    1111dnl
    12 AC_DEFUN([AM_PATH_LIBGNUTLS_EXTRA],
     12AC_DEFUN([AM_PATH_LIBGNUTLS],
    1313[dnl
    14 dnl Get the cflags and libraries from the libgnutls-extra-config script
     14dnl Get the cflags and libraries from the libgnutls-config script
    1515dnl
    16 AC_ARG_WITH(libgnutls-extra-prefix,
    17           [  --with-libgnutls-extra-prefix=PFX   Prefix where libgnutls-extra is installed (optional)],
    18           libgnutls_extra_config_prefix="$withval", libgnutls_extra_config_prefix="")
     16AC_ARG_WITH(libgnutls-prefix,
     17          [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
     18          libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
    1919
    20   if test x$libgnutls_extra_config_prefix != x ; then
    21      if test x${LIBGNUTLS_EXTRA_CONFIG+set} != xset ; then
    22         LIBGNUTLS_EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config
     20  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
    2323     fi
    2424  fi
    2525
    26   AC_PATH_PROG(LIBGNUTLS_EXTRA_CONFIG, libgnutls-extra-config, no)
     26  AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
    2727  min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
    2828  AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
    2929  no_libgnutls=""
    30   if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
     30  if test "$LIBGNUTLS_CONFIG" = "no" ; then
    3131    no_libgnutls=yes
    3232  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`
    3636
    3737
    3838      ac_save_CFLAGS="$CFLAGS"
    3939      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"
    4242dnl
    4343dnl Now check if the installed libgnutls is sufficiently new. Also sanity
    44 dnl checks the results of libgnutls-extra-config to some extent
     44dnl checks the results of libgnutls-config to some extent
    4545dnl
    4646      rm -f conf.libgnutlstest
     
    4949#include <stdlib.h>
    5050#include <string.h>
    51 #include <gnutls/extra.h>
     51#include <gnutls/gnutls.h>
    5252
    5353int
     
    5656    system ("touch conf.libgnutlstest");
    5757
    58     if( strcmp( gnutls_extra_check_version(NULL), "$libgnutls_extra_config_version" ) )
     58    if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
    5959    {
    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");
    6464      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
    6565      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
    6666      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");
    6969      printf("*** before re-running configure\n");
    7070    }
    71     else if ( strcmp(gnutls_extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) )
     71    else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
    7272    {
    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) );
    7675    }
    7776    else
    7877    {
    79       if ( gnutls_extra_check_version( "$min_libgnutls_version" ) )
     78      if ( gnutls_check_version( "$min_libgnutls_version" ) )
    8079      {
    8180        return 0;
     
    8382     else
    8483      {
    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_EXTRA newer 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",
    8887               "$min_libgnutls_version" );
    89         printf("*** LIBGNUTLS_EXTRA is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
     88        printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
    9089        printf("*** \n");
    9190        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");
    9392        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");
    9695        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
    9796        printf("*** so that the correct libraries are found at run-time))\n");
     
    114113        AC_MSG_RESULT(no)
    115114     fi
    116      if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then
    117        echo "*** The libgnutls-extra-config script installed by LIBGNUTLS_EXTRA could not be found"
    118        echo "*** If LIBGNUTLS_EXTRA was 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."
    121120     else
    122121       if test -f conf.libgnutlstest ; then
     
    124123       else
    125124          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"
    128127          AC_TRY_LINK([
    129128#include <stdio.h>
    130129#include <stdlib.h>
    131130#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); ],
    134133        [ echo "*** The test program compiled, but did not run. This usually means"
    135           echo "*** that the run-time linker is not finding LIBGNUTLS_EXTRA or 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"
    137136          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
    138137          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
     
    143142          echo "***" ],
    144143        [ 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_EXTRA was incorrectly installed"
    146           echo "*** or that you have moved LIBGNUTLS_EXTRA since 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" ])
    148147          CFLAGS="$ac_save_CFLAGS"
    149148          LIBS="$ac_save_LIBS"
    150149       fi
    151150     fi
    152      LIBGNUTLS_EXTRA_CFLAGS=""
    153      LIBGNUTLS_EXTRA_LIBS=""
     151     LIBGNUTLS_CFLAGS=""
     152     LIBGNUTLS_LIBS=""
    154153     ifelse([$3], , :, [$3])
    155154  fi
    156155  rm -f conf.libgnutlstest
    157   AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
    158   AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
    159156
    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`"
    164159  GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
    165160
     
    169164  AC_SUBST(LIBGNUTLS_PREFIX)
    170165  AC_SUBST(LIBGNUTLS_CERTTOOL)
    171  
     166
    172167])
    173168
  • src/Makefile.in

    r9d9b093 r8ce897a  
    1 # Makefile.in generated by automake 1.10 from Makefile.am.
     1# Makefile.in generated by automake 1.10.1 from Makefile.am.
    22# @configure_input@
    33
    44# 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.
    66# This Makefile.in is free software; the Free Software Foundation
    77# gives unlimited permission to copy and/or distribute it,
     
    6464        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmod_gnutls_la_CFLAGS) \
    6565        $(CFLAGS) $(libmod_gnutls_la_LDFLAGS) $(LDFLAGS) -o $@
    66 DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
     66DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
    6767depcomp = $(SHELL) $(top_srcdir)/config/depcomp
    6868am__depfiles_maybe = depfiles
     
    126126DEFS = @DEFS@
    127127DEPDIR = @DEPDIR@
     128DSYMUTIL = @DSYMUTIL@
    128129ECHO = @ECHO@
    129130ECHO_C = @ECHO_C@
     
    143144LIBGNUTLS_CERTTOOL = @LIBGNUTLS_CERTTOOL@
    144145LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
    145 LIBGNUTLS_EXTRA_CFLAGS = @LIBGNUTLS_EXTRA_CFLAGS@
    146 LIBGNUTLS_EXTRA_CONFIG = @LIBGNUTLS_EXTRA_CONFIG@
    147 LIBGNUTLS_EXTRA_LIBS = @LIBGNUTLS_EXTRA_LIBS@
     146LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
    148147LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
    149148LIBGNUTLS_PREFIX = @LIBGNUTLS_PREFIX@
     
    160159MODULE_LIBS = @MODULE_LIBS@
    161160MOD_GNUTLS_VERSION = @MOD_GNUTLS_VERSION@
     161NMEDIT = @NMEDIT@
    162162OBJEXT = @OBJEXT@
    163163OOO_MAINTAIN = @OOO_MAINTAIN@
     
    276276          if test -f $$p; then \
    277277            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"; \
    280280          else :; fi; \
    281281        done
     
    285285        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
    286286          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"; \
    289289        done
    290290
     
    379379            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    380380          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; }; }'`; \
    383383        mkid -fID $$unique
    384384tags: TAGS
     
    392392            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    393393          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; }; }'`; \
    396396        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
    397397          test -n "$$unique" || unique=$$empty_fix; \
     
    403403                $(TAGS_FILES) $(LISP)
    404404        tags=; \
    405         here=`pwd`; \
    406405        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    407406        unique=`for i in $$list; do \
    408407            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    409408          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; }; }'`; \
    412411        test -z "$(CTAGS_ARGS)$$tags$$unique" \
    413412          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  • src/gnutls_hooks.c

    r9d9b093 r8ce897a  
    8484    }
    8585
    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                                            
    9286    apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config,
    9387                              apr_pool_cleanup_null);
Note: See TracChangeset for help on using the changeset viewer.