ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/configure
(Generate patch)

Comparing ircd-hybrid/branches/8.2.x/configure (file contents):
Revision 4908 by michael, Sat Nov 22 21:55:15 2014 UTC vs.
Revision 4960 by michael, Sun Nov 30 17:50:57 2014 UTC

# Line 656 | Line 656 | CONVENIENCE_LTDL_FALSE
656   CONVENIENCE_LTDL_TRUE
657   INSTALL_LTDL_FALSE
658   INSTALL_LTDL_TRUE
659 < ARGZ_H
659 > LT_ARGZ_H
660   sys_symbol_underscore
661   LIBADD_DL
662   LT_DLPREOPEN
# Line 798 | Line 798 | enable_static
798   enable_shared
799   with_pic
800   enable_fast_install
801 + with_aix_soname
802   with_gnu_ld
803   with_sysroot
804   enable_libtool_lock
# Line 1475 | Line 1476 | Optional Packages:
1476    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
1477    --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
1478                            both]
1479 +  --with-aix-soname=aix|svr4|both
1480 +                          shared library versioning (aka "SONAME") variant to
1481 +                          provide on AIX, [default=aix].
1482    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
1483    --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
1484                            compiler's sysroot if not specified).
# Line 4471 | Line 4475 | esac
4475  
4476  
4477  
4478 < macro_version='2.4.2.458.26-92994'
4479 < macro_revision='2.4.3'
4478 > macro_version='2.4.4'
4479 > macro_revision='2.4.4'
4480  
4481  
4482  
# Line 5844 | Line 5848 | sysv4 | sysv4.3*)
5848   tpf*)
5849    lt_cv_deplibs_check_method=pass_all
5850    ;;
5851 + os2*)
5852 +  lt_cv_deplibs_check_method=pass_all
5853 +  ;;
5854   esac
5855  
5856   fi
# Line 8312 | Line 8319 | fi
8319  
8320  
8321  
8322 +  shared_archive_member_spec=
8323 + case $host,$enable_shared in
8324 + power*-*-aix[5-9]*,yes)
8325 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
8326 + $as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
8327 +
8328 + # Check whether --with-aix-soname was given.
8329 + if test "${with_aix_soname+set}" = set; then :
8330 +  withval=$with_aix_soname; case $withval in
8331 +    aix|svr4|both)
8332 +      ;;
8333 +    *)
8334 +      as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
8335 +      ;;
8336 +    esac
8337 +    lt_cv_with_aix_soname=$with_aix_soname
8338 + else
8339 +  if ${lt_cv_with_aix_soname+:} false; then :
8340 +  $as_echo_n "(cached) " >&6
8341 + else
8342 +  lt_cv_with_aix_soname=aix
8343 + fi
8344 +
8345 +    with_aix_soname=$lt_cv_with_aix_soname
8346 + fi
8347 +
8348 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
8349 + $as_echo "$with_aix_soname" >&6; }
8350 +  if test aix != "$with_aix_soname"; then
8351 +    # For the AIX way of multilib, we name the shared archive member
8352 +    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
8353 +    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
8354 +    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
8355 +    # the AIX toolchain works better with OBJECT_MODE set (default 32).
8356 +    if test 64 = "${OBJECT_MODE-32}"; then
8357 +      shared_archive_member_spec=shr_64
8358 +    else
8359 +      shared_archive_member_spec=shr
8360 +    fi
8361 +  fi
8362 +  ;;
8363 + *)
8364 +  with_aix_soname=aix
8365 +  ;;
8366 + esac
8367 +
8368 +
8369 +
8370 +
8371 +
8372 +
8373 +
8374  
8375  
8376  
# Line 8750 | Line 8809 | lt_prog_compiler_static=
8809        # Although the cygwin gcc ignores -fPIC, still need this for old-style
8810        # (--disable-auto-import) libraries
8811        lt_prog_compiler_pic='-DDLL_EXPORT'
8812 +      case $host_os in
8813 +      os2*)
8814 +        lt_prog_compiler_static='$wl-static'
8815 +        ;;
8816 +      esac
8817        ;;
8818  
8819      darwin* | rhapsody*)
# Line 8846 | Line 8910 | lt_prog_compiler_static=
8910        # This hack is so that the source file can tell whether it is being
8911        # built for inclusion in a dll (and should export symbols for example).
8912        lt_prog_compiler_pic='-DDLL_EXPORT'
8913 +      case $host_os in
8914 +      os2*)
8915 +        lt_prog_compiler_static='$wl-static'
8916 +        ;;
8917 +      esac
8918        ;;
8919  
8920      hpux9* | hpux10* | hpux11*)
# Line 9486 | Line 9555 | _LT_EOF
9555        link_all_deplibs=yes
9556        ;;
9557  
9558 +    os2*)
9559 +      hardcode_libdir_flag_spec='-L$libdir'
9560 +      hardcode_minus_L=yes
9561 +      allow_undefined_flag=unsupported
9562 +      shrext_cmds=.dll
9563 +      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
9564 +        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
9565 +        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
9566 +        $ECHO EXPORTS >> $output_objdir/$libname.def~
9567 +        emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
9568 +        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
9569 +        emximp -o $lib $output_objdir/$libname.def'
9570 +      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
9571 +        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
9572 +        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
9573 +        $ECHO EXPORTS >> $output_objdir/$libname.def~
9574 +        prefix_cmds="$SED"~
9575 +        if test EXPORTS = "`$SED 1q $export_symbols`"; then
9576 +          prefix_cmds="$prefix_cmds -e 1d";
9577 +        fi~
9578 +        prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
9579 +        cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
9580 +        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
9581 +        emximp -o $lib $output_objdir/$libname.def'
9582 +      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
9583 +      enable_shared_with_static_runtimes=yes
9584 +      ;;
9585 +
9586      interix[3-9]*)
9587        hardcode_direct=no
9588        hardcode_shlibpath_var=no
# Line 9559 | Line 9656 | _LT_EOF
9656          fi
9657  
9658          case $cc_basename in
9659 +        tcc*)
9660 +          export_dynamic_flag_spec='-rdynamic'
9661 +          ;;
9662          xlf* | bgf* | bgxlf* | mpixlf*)
9663            # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
9664            whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
# Line 9688 | Line 9788 | _LT_EOF
9788          no_entry_flag=
9789        else
9790          # If we're using GNU nm, then we don't want the "-C" option.
9791 <        # -C means demangle to AIX nm, but means don't demangle with GNU nm
9792 <        # Also, AIX nm treats weak defined symbols like other global
9793 <        # defined symbols, whereas GNU nm marks them as "W".
9791 >        # -C means demangle to GNU nm, but means don't demangle to AIX nm.
9792 >        # Without the "-l" option, or with the "-B" option, AIX nm treats
9793 >        # weak defined symbols like other global defined symbols, whereas
9794 >        # GNU nm marks them as "W".
9795 >        # While the 'weak' keyword is ignored in the Export File, we need
9796 >        # it in the Import File for the 'aix-soname' feature, so we have
9797 >        # to replace the "-B" option with "-P" for AIX nm.
9798          if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
9799 <          export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
9799 >          export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
9800          else
9801 <          export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
9801 >          export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
9802          fi
9803          aix_use_runtimelinking=no
9804  
9805          # Test if we are trying to use run time linking or normal
9806          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
9807 <        # need to do runtime linking.
9807 >        # have runtime linking enabled, and use it for executables.
9808 >        # For shared libraries, we enable/disable runtime linking
9809 >        # depending on the kind of the shared library created -
9810 >        # when "with_aix_soname,aix_use_runtimelinking" is:
9811 >        # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
9812 >        # "aix,yes"  lib.so          shared, rtl:yes, for executables
9813 >        #            lib.a           static archive
9814 >        # "both,no"  lib.so.V(shr.o) shared, rtl:yes
9815 >        #            lib.a(lib.so.V) shared, rtl:no,  for executables
9816 >        # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
9817 >        #            lib.a(lib.so.V) shared, rtl:no
9818 >        # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
9819 >        #            lib.a           static archive
9820          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
9821            for ld_flag in $LDFLAGS; do
9822            if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
# Line 9708 | Line 9824 | _LT_EOF
9824              break
9825            fi
9826            done
9827 +          if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
9828 +            # With aix-soname=svr4, we create the lib.so.V shared archives only,
9829 +            # so we don't have lib.a shared libs to link our executables.
9830 +            # We have to force runtime linking in this case.
9831 +            aix_use_runtimelinking=yes
9832 +            LDFLAGS="$LDFLAGS -Wl,-brtl"
9833 +          fi
9834            ;;
9835          esac
9836  
# Line 9727 | Line 9850 | _LT_EOF
9850        hardcode_libdir_separator=':'
9851        link_all_deplibs=yes
9852        file_list_spec='$wl-f,'
9853 +      case $with_aix_soname,$aix_use_runtimelinking in
9854 +      aix,*) ;; # traditional, no import file
9855 +      svr4,* | *,yes) # use import file
9856 +        # The Import File defines what to hardcode.
9857 +        hardcode_direct=no
9858 +        hardcode_direct_absolute=no
9859 +        ;;
9860 +      esac
9861  
9862        if test yes = "$GCC"; then
9863          case $host_os in aix4.[012]|aix4.[012].*)
# Line 9754 | Line 9885 | _LT_EOF
9885          if test yes = "$aix_use_runtimelinking"; then
9886            shared_flag="$shared_flag "'$wl-G'
9887          fi
9888 +        # Need to ensure runtime linking is disabled for the traditional
9889 +        # shared library, or the linker may eventually find shared libraries
9890 +        # /with/ Import File - we do not want to mix them.
9891 +        shared_flag_aix='-shared'
9892 +        shared_flag_svr4='-shared $wl-G'
9893        else
9894          # not using gcc
9895          if test ia64 = "$host_cpu"; then
# Line 9766 | Line 9902 | _LT_EOF
9902            else
9903              shared_flag='$wl-bM:SRE'
9904            fi
9905 +          shared_flag_aix='$wl-bM:SRE'
9906 +          shared_flag_svr4='$wl-G'
9907          fi
9908        fi
9909  
# Line 9773 | Line 9911 | _LT_EOF
9911        # It seems that -bexpall does not export symbols beginning with
9912        # underscore (_), so it is better to generate a list of symbols to export.
9913        always_export_symbols=yes
9914 <      if test yes = "$aix_use_runtimelinking"; then
9914 >      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
9915          # Warning - without using the other runtime loading flags (-brtl),
9916          # -berok will link without error, but may produce a broken library.
9917          allow_undefined_flag='-berok'
# Line 9888 | Line 10026 | fi
10026              whole_archive_flag_spec='$convenience'
10027            fi
10028            archive_cmds_need_lc=yes
10029 <          # This is similar to how AIX traditionally builds its shared libraries.
10030 <          archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
10029 >          archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
10030 >          # -brtl affects multiple linker settings, -berok does not and is overridden later
10031 >          compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
10032 >          if test svr4 != "$with_aix_soname"; then
10033 >            # This is similar to how AIX traditionally builds its shared libraries.
10034 >            archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
10035 >          fi
10036 >          if test aix != "$with_aix_soname"; then
10037 >            archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
10038 >          else
10039 >            # used by -dlpreopen to get the symbols
10040 >            archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
10041 >          fi
10042 >          archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
10043          fi
10044        fi
10045        ;;
# Line 10208 | Line 10358 | $as_echo "$lt_cv_irix_exported_symbol" >
10358        link_all_deplibs=yes
10359        ;;
10360  
10361 +    linux*)
10362 +      case $cc_basename in
10363 +      tcc*)
10364 +        # Fabrice Bellard et al's Tiny C Compiler
10365 +        ld_shlibs=yes
10366 +        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
10367 +        ;;
10368 +      esac
10369 +      ;;
10370 +
10371      netbsd*)
10372        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
10373          archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
# Line 10253 | Line 10413 | $as_echo "$lt_cv_irix_exported_symbol" >
10413        hardcode_libdir_flag_spec='-L$libdir'
10414        hardcode_minus_L=yes
10415        allow_undefined_flag=unsupported
10416 <      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
10417 <      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
10416 >      shrext_cmds=.dll
10417 >      archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
10418 >        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
10419 >        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
10420 >        $ECHO EXPORTS >> $output_objdir/$libname.def~
10421 >        emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
10422 >        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
10423 >        emximp -o $lib $output_objdir/$libname.def'
10424 >      archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
10425 >        $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
10426 >        $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
10427 >        $ECHO EXPORTS >> $output_objdir/$libname.def~
10428 >        prefix_cmds="$SED"~
10429 >        if test EXPORTS = "`$SED 1q $export_symbols`"; then
10430 >          prefix_cmds="$prefix_cmds -e 1d";
10431 >        fi~
10432 >        prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
10433 >        cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
10434 >        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
10435 >        emximp -o $lib $output_objdir/$libname.def'
10436 >      old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
10437 >      enable_shared_with_static_runtimes=yes
10438        ;;
10439  
10440      osf3*)
# Line 10813 | Line 10993 | aix[4-9]*)
10993        fi
10994        ;;
10995      esac
10996 +    # Using Import Files as archive members, it is possible to support
10997 +    # filename-based versioning of shared library archives on AIX. While
10998 +    # this would work for both with and without runtime linking, it will
10999 +    # prevent static linking of such archives. So we do filename-based
11000 +    # shared library versioning with .so extension only, which is used
11001 +    # when both runtime linking and shared linking is enabled.
11002 +    # Unfortunately, runtime linking may impact performance, so we do
11003 +    # not want this to be the default eventually. Also, we use the
11004 +    # versioned .so libs for executables only if there is the -brtl
11005 +    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
11006 +    # To allow for filename-based versioning support, we need to create
11007 +    # libNAME.so.V as an archive file, containing:
11008 +    # *) an Import File, referring to the versioned filename of the
11009 +    #    archive as well as the shared archive member, telling the
11010 +    #    bitwidth (32 or 64) of that shared object, and providing the
11011 +    #    list of exported symbols of that shared object, eventually
11012 +    #    decorated with the 'weak' keyword
11013 +    # *) the shared object with the F_LOADONLY flag set, to really avoid
11014 +    #    it being seen by the linker.
11015 +    # At run time we better use the real file rather than another symlink,
11016 +    # but for link time we create the symlink libNAME.so -> libNAME.so.V
11017 +
11018 +    case $with_aix_soname,$aix_use_runtimelinking in
11019      # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
11020      # soname into executable. Probably we can add versioning support to
11021      # collect2, so additional links can be useful in future.
11022 <    if test yes = "$aix_use_runtimelinking"; then
11022 >    aix,yes) # traditional libtool
11023 >      dynamic_linker='AIX unversionable lib.so'
11024        # If using run time linking (on AIX 4.2 or later) use lib<name>.so
11025        # instead of lib<name>.a to let people know that these are not
11026        # typical AIX shared libraries.
11027        library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
11028 <    else
11028 >      ;;
11029 >    aix,no) # traditional AIX only
11030 >      dynamic_linker='AIX lib.a(lib.so.V)'
11031        # We preserve .a as extension for shared libraries through AIX4.2
11032        # and later when we are not doing run time linking.
11033        library_names_spec='$libname$release.a $libname.a'
11034        soname_spec='$libname$release$shared_ext$major'
11035 <    fi
11035 >      ;;
11036 >    svr4,*) # full svr4 only
11037 >      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
11038 >      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
11039 >      # We do not specify a path in Import Files, so LIBPATH fires.
11040 >      shlibpath_overrides_runpath=yes
11041 >      ;;
11042 >    *,yes) # both, prefer svr4
11043 >      dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
11044 >      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
11045 >      # unpreferred sharedlib libNAME.a needs extra handling
11046 >      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
11047 >      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
11048 >      # We do not specify a path in Import Files, so LIBPATH fires.
11049 >      shlibpath_overrides_runpath=yes
11050 >      ;;
11051 >    *,no) # both, prefer aix
11052 >      dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
11053 >      library_names_spec='$libname$release.a $libname.a'
11054 >      soname_spec='$libname$release$shared_ext$major'
11055 >      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
11056 >      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
11057 >      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
11058 >      ;;
11059 >    esac
11060      shlibpath_var=LIBPATH
11061    fi
11062    ;;
# Line 11014 | Line 11244 | freebsd* | dragonfly*)
11244    version_type=freebsd-$objformat
11245    case $version_type in
11246      freebsd-elf*)
11247 <      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
11247 >      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
11248        need_version=no
11249        need_lib_prefix=no
11250        ;;
# Line 11298 | Line 11528 | openbsd* | bitrig*)
11528  
11529   os2*)
11530    libname_spec='$name'
11531 +  version_type=windows
11532    shrext_cmds=.dll
11533 +  need_version=no
11534    need_lib_prefix=no
11535 <  library_names_spec='$libname$shared_ext $libname.a'
11535 >  # OS/2 can only load a DLL with a base name of 8 characters or less.
11536 >  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
11537 >    v=$($ECHO $release$versuffix | tr -d .-);
11538 >    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
11539 >    $ECHO $n$v`$shared_ext'
11540 >  library_names_spec='${libname}_dll.$libext'
11541    dynamic_linker='OS/2 ld.exe'
11542 <  shlibpath_var=LIBPATH
11542 >  shlibpath_var=BEGINLIBPATH
11543 >  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
11544 >  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
11545 >  postinstall_cmds='base_file=`basename \$file`~
11546 >    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
11547 >    dldir=$destdir/`dirname \$dlpath`~
11548 >    test -d \$dldir || mkdir -p \$dldir~
11549 >    $install_prog $dir/$dlname \$dldir/$dlname~
11550 >    chmod a+x \$dldir/$dlname~
11551 >    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
11552 >      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
11553 >    fi'
11554 >  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
11555 >    dlpath=$dir/\$dldll~
11556 >    $RM \$dlpath'
11557    ;;
11558  
11559   osf3* | osf4* | osf5*)
# Line 11378 | Line 11629 | sysv4*MP*)
11629    ;;
11630  
11631   sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
11632 <  version_type=freebsd-elf
11632 >  version_type=sco
11633    need_lib_prefix=no
11634    need_version=no
11635    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
# Line 11907 | Line 12158 | else
12158   #  endif
12159   #endif
12160  
12161 < /* When -fvisbility=hidden is used, assume the code has been annotated
12161 > /* When -fvisibility=hidden is used, assume the code has been annotated
12162     correspondingly for the symbols needed.  */
12163   #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12164   int fnord () __attribute__((visibility("default")));
# Line 12013 | Line 12264 | else
12264   #  endif
12265   #endif
12266  
12267 < /* When -fvisbility=hidden is used, assume the code has been annotated
12267 > /* When -fvisibility=hidden is used, assume the code has been annotated
12268     correspondingly for the symbols needed.  */
12269   #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12270   int fnord () __attribute__((visibility("default")));
# Line 12162 | Line 12413 | $as_echo_n "checking whether to build sh
12413      ;;
12414  
12415    aix[4-9]*)
12416 <    if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
12417 <      test yes = "$enable_shared" && enable_static=no
12416 >    if test ia64 != "$host_cpu"; then
12417 >      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
12418 >      yes,aix,yes) ;;                   # shared object as lib.so file only
12419 >      yes,svr4,*) ;;                    # shared object as lib.so archive member only
12420 >      yes,*) enable_static=no ;;        # shared object in lib.a archive as well
12421 >      esac
12422      fi
12423      ;;
12424    esac
# Line 12239 | Line 12494 | cat >>confdefs.h <<_ACEOF
12494   _ACEOF
12495  
12496   fi
12497 + if test -n "$shared_archive_member_spec"; then
12498 +
12499 + cat >>confdefs.h <<_ACEOF
12500 + #define LT_SHARED_LIB_MEMBER "($shared_archive_member_spec.o)"
12501 + _ACEOF
12502 +
12503 + fi
12504  
12505   { $as_echo "$as_me:${as_lineno-$LINENO}: checking what variable specifies run-time module search path" >&5
12506   $as_echo_n "checking what variable specifies run-time module search path... " >&6; }
# Line 12292 | Line 12554 | ac_compile='$CC -c $CFLAGS $CPPFLAGS con
12554   ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
12555   ac_compiler_gnu=$ac_cv_c_compiler_gnu
12556  
12557 + lt_dlload_save_LIBS=$LIBS
12558  
12559   LIBADD_DLOPEN=
12560   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
# Line 12516 | Line 12779 | fi
12779   beos*)
12780    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
12781    ;;
12782 < cygwin* | mingw* | os2* | pw32*)
12782 > cygwin* | mingw* | pw32*)
12783    ac_fn_c_check_decl "$LINENO" "cygwin_conv_path" "ac_cv_have_decl_cygwin_conv_path" "#include <sys/cygwin.h>
12784   "
12785   if test "x$ac_cv_have_decl_cygwin_conv_path" = xyes; then :
# Line 12594 | Line 12857 | fi
12857   LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
12858  
12859  
12860 + LIBS=$lt_dlload_save_LIBS
12861   ac_ext=c
12862   ac_cpp='$CPP $CPPFLAGS'
12863   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 12649 | Line 12913 | $as_echo "$lt_cv_sys_symbol_underscore"
12913  
12914  
12915   if test yes = "$lt_cv_sys_symbol_underscore"; then
12916 <  if test yes = "$libltdl_cv_func_dlopen" ||
12917 <     test yes = "$libltdl_cv_lib_dl_dlopen"; then
12654 <        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have to add an underscore for dlsym" >&5
12916 >  if test yes = "$libltdl_cv_func_dlopen" || test yes = "$libltdl_cv_lib_dl_dlopen"; then
12917 >    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have to add an underscore for dlsym" >&5
12918   $as_echo_n "checking whether we have to add an underscore for dlsym... " >&6; }
12919   if ${libltdl_cv_need_uscore+:} false; then :
12920    $as_echo_n "(cached) " >&6
12921   else
12922    libltdl_cv_need_uscore=unknown
12923 <          save_LIBS=$LIBS
12924 <          LIBS="$LIBS $LIBADD_DLOPEN"
12925 <          if test yes = "$cross_compiling"; then :
12926 <  libltdl_cv_need_uscore=cross
12664 < else
12665 <  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12666 <  lt_status=$lt_dlunknown
12667 <  cat > conftest.$ac_ext <<_LT_EOF
12923 >      dlsym_uscore_save_LIBS=$LIBS
12924 >      LIBS="$LIBS $LIBADD_DLOPEN"
12925 >      libname=conftmod # stay within 8.3 filename limits!
12926 >      cat >$libname.$ac_ext <<_LT_EOF
12927   #line $LINENO "configure"
12928   #include "confdefs.h"
12929 + /* When -fvisibility=hidden is used, assume the code has been annotated
12930 +   correspondingly for the symbols needed.  */
12931 + #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12932 + int fnord () __attribute__((visibility("default")));
12933 + #endif
12934 + int fnord () { return 42; }
12935 + _LT_EOF
12936  
12937 +      # ltfn_module_cmds module_cmds
12938 +      # Execute tilde-delimited MODULE_CMDS with environment primed for
12939 +      # $module_cmds or $archive_cmds type content.
12940 +      ltfn_module_cmds ()
12941 +      {( # subshell avoids polluting parent global environment
12942 +          module_cmds_save_ifs=$IFS; IFS='~'
12943 +          for cmd in $1; do
12944 +            IFS=$module_cmds_save_ifs
12945 +            libobjs=$libname.$ac_objext; lib=$libname$libltdl_cv_shlibext
12946 +            rpath=/not-exists; soname=$libname$libltdl_cv_shlibext; output_objdir=.
12947 +            major=; versuffix=; verstring=; deplibs=
12948 +            ECHO=echo; wl=$lt_prog_compiler_wl; allow_undefined_flag=
12949 +            eval $cmd
12950 +          done
12951 +          IFS=$module_cmds_save_ifs
12952 +      )}
12953 +
12954 +      # Compile a loadable module using libtool macro expansion results.
12955 +      $CC $pic_flag -c $libname.$ac_ext
12956 +      ltfn_module_cmds "${module_cmds:-$archive_cmds}"
12957 +
12958 +      # Try to fetch fnord with dlsym().
12959 +      libltdl_dlunknown=0; libltdl_dlnouscore=1; libltdl_dluscore=2
12960 +      cat >conftest.$ac_ext <<_LT_EOF
12961 + #line $LINENO "configure"
12962 + #include "confdefs.h"
12963   #if HAVE_DLFCN_H
12964   #include <dlfcn.h>
12965   #endif
12674
12966   #include <stdio.h>
12967 <
12677 < #ifdef RTLD_GLOBAL
12678 < #  define LT_DLGLOBAL           RTLD_GLOBAL
12679 < #else
12967 > #ifndef RTLD_GLOBAL
12968   #  ifdef DL_GLOBAL
12969 < #    define LT_DLGLOBAL         DL_GLOBAL
12969 > #    define RTLD_GLOBAL DL_GLOBAL
12970   #  else
12971 < #    define LT_DLGLOBAL         0
12971 > #    define RTLD_GLOBAL 0
12972   #  endif
12973   #endif
12974 <
12975 < /* We may have to define LT_DLLAZY_OR_NOW in the command line if we
12976 <   find out it does not work in some platform. */
12689 < #ifndef LT_DLLAZY_OR_NOW
12690 < #  ifdef RTLD_LAZY
12691 < #    define LT_DLLAZY_OR_NOW            RTLD_LAZY
12974 > #ifndef RTLD_NOW
12975 > #  ifdef DL_NOW
12976 > #    define RTLD_NOW DL_NOW
12977   #  else
12978 < #    ifdef DL_LAZY
12694 < #      define LT_DLLAZY_OR_NOW          DL_LAZY
12695 < #    else
12696 < #      ifdef RTLD_NOW
12697 < #        define LT_DLLAZY_OR_NOW        RTLD_NOW
12698 < #      else
12699 < #        ifdef DL_NOW
12700 < #          define LT_DLLAZY_OR_NOW      DL_NOW
12701 < #        else
12702 < #          define LT_DLLAZY_OR_NOW      0
12703 < #        endif
12704 < #      endif
12705 < #    endif
12978 > #    define RTLD_NOW 0
12979   #  endif
12980   #endif
12981 <
12982 < /* When -fvisbility=hidden is used, assume the code has been annotated
12983 <   correspondingly for the symbols needed.  */
12984 < #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
12985 < int fnord () __attribute__((visibility("default")));
12986 < #endif
12987 <
12988 < int fnord () { return 42; }
12989 < int main ()
12717 < {
12718 <  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
12719 <  int status = $lt_dlunknown;
12720 <
12721 <  if (self)
12722 <    {
12723 <      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
12981 > int main () {
12982 >  void *handle = dlopen ("`pwd`/$libname$libltdl_cv_shlibext", RTLD_GLOBAL|RTLD_NOW);
12983 >  int status = $libltdl_dlunknown;
12984 >  if (handle) {
12985 >    if (dlsym (handle, "fnord"))
12986 >      status = $libltdl_dlnouscore;
12987 >    else {
12988 >      if (dlsym (handle, "_fnord"))
12989 >        status = $libltdl_dluscore;
12990        else
12991 <        {
12726 <          if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
12727 <          else puts (dlerror ());
12728 <        }
12729 <      /* dlclose (self); */
12991 >        puts (dlerror ());
12992      }
12993 <  else
12993 >    dlclose (handle);
12994 >  } else
12995      puts (dlerror ());
12733
12996    return status;
12997   }
12998   _LT_EOF
12999 <  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
12999 >      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
13000    (eval $ac_link) 2>&5
13001    ac_status=$?
13002    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13003    test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
13004 <    (./conftest; exit; ) >&5 2>/dev/null
13005 <    lt_status=$?
13006 <    case x$lt_status in
13007 <      x$lt_dlno_uscore) libltdl_cv_need_uscore=no ;;
13008 <      x$lt_dlneed_uscore) libltdl_cv_need_uscore=yes ;;
13009 <      x$lt_dlunknown|x*)  ;;
13010 <    esac
13011 <  else :
13012 <    # compilation failed
13013 <
12752 <  fi
12753 < fi
12754 < rm -fr conftest*
12755 <
12756 <          LIBS=$save_LIBS
13004 >        (./conftest; exit; ) >&5 2>/dev/null
13005 >        libltdl_status=$?
13006 >        case x$libltdl_status in
13007 >          x$libltdl_dlnouscore) libltdl_cv_need_uscore=no ;;
13008 >          x$libltdl_dluscore) libltdl_cv_need_uscore=yes ;;
13009 >          x*) libltdl_cv_need_uscore=unknown ;;
13010 >        esac
13011 >      fi
13012 >      rm -rf conftest* $libname*
13013 >      LIBS=$dlsym_uscore_save_LIBS
13014  
13015   fi
13016   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libltdl_cv_need_uscore" >&5
# Line 12872 | Line 13129 | $as_echo "#define LTDL_DLOPEN_DEPLIBS 1"
13129  
13130   fi
13131  
12875 :
13132  
13133   for ac_header in argz.h
13134   do :
# Line 12909 | Line 13165 | $as_echo "#define __error_t_defined 1" >
13165   fi
13166  
13167  
13168 < ARGZ_H=
13168 > LT_ARGZ_H=
13169   for ac_func in argz_add argz_append argz_count argz_create_sep argz_insert \
13170          argz_next argz_stringify
13171   do :
# Line 12921 | Line 13177 | if eval test \"x\$"$as_ac_var"\" = x"yes
13177   _ACEOF
13178  
13179   else
13180 <  ARGZ_H=argz.h;
13180 >  LT_ARGZ_H=lt__argz.h;
13181  
13182 <  _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
13182 >  _LT_LIBOBJS="$_LT_LIBOBJS lt__argz.$ac_objext"
13183  
13184   fi
13185   done
13186  
13187  
13188 < if test -z "$ARGZ_H"; then :
13188 > if test -z "$LT_ARGZ_H"; then :
13189    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if argz actually works" >&5
13190   $as_echo_n "checking if argz actually works... " >&6; }
13191   if ${lt_cv_sys_argz_works+:} false; then :
# Line 12968 | Line 13224 | $as_echo "$lt_cv_sys_argz_works" >&6; }
13224   $as_echo "#define HAVE_WORKING_ARGZ 1" >>confdefs.h
13225  
13226   else
13227 <  ARGZ_H=argz.h
13227 >  LT_ARGZ_H=lt__argz.h
13228  
13229  
13230 <  _LT_LIBOBJS="$_LT_LIBOBJS argz.$ac_objext"
13230 >  _LT_LIBOBJS="$_LT_LIBOBJS lt__argz.$ac_objext"
13231  
13232   fi
13233   fi
# Line 16979 | Line 17235 | enable_static='`$ECHO "$enable_static" |
17235   enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
17236   pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
17237   enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
17238 + shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
17239   SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
17240   ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
17241   PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
# Line 18018 | Line 18275 | pic_mode=$pic_mode
18275   # Whether or not to optimize for fast installation.
18276   fast_install=$enable_fast_install
18277  
18278 + # Shared archive member basename,for filename based shared library versioning on AIX.
18279 + shared_archive_member_spec=$shared_archive_member_spec
18280 +
18281   # Shell to use when invoking shell scripts.
18282   SHELL=$lt_SHELL
18283  

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)