Difference for ./aclocal.m4 from version 1.25 to 1.26


version 1.25 version 1.26
Line 219
 
Line 219
     [pic_mode=default])      [pic_mode=default])
 test -z "$pic_mode" && pic_mode=default  test -z "$pic_mode" && pic_mode=default
   
 # Check if we have a version mismatch between libtool.m4 and ltmain.sh.  
 #  
 # Note:  This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.  
 #        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually  
 #        calls AC_LIBTOOL_CONFIG and creates libtool.  
 #  
 _LT_VERSION_CHECK  
   
 # Use C for the default configuration in the libtool script  # Use C for the default configuration in the libtool script
 tagname=  tagname=
 AC_LIBTOOL_LANG_C_CONFIG  AC_LIBTOOL_LANG_C_CONFIG
Line 234
 
Line 226
 ])# AC_LIBTOOL_SETUP  ])# AC_LIBTOOL_SETUP
   
   
 # _LT_VERSION_CHECK  
 # -----------------  
 AC_DEFUN([_LT_VERSION_CHECK],  
 [AC_MSG_CHECKING([for correct ltmain.sh version])  
 if test "x$ltmain" = "x" ; then  
   AC_MSG_RESULT(no)  
   AC_MSG_ERROR([  
   
 *** @<:@Gentoo@:>@ sanity check failed! ***  
 *** \$ltmain is not defined, please check the patch for consistency! ***  
 ])  
 fi  
 gentoo_lt_version="1.5.22"  
 gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`  
 if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then  
   AC_MSG_RESULT(no)  
   AC_MSG_ERROR([  
   
 *** @<:@Gentoo@:>@ sanity check failed! ***  
 *** libtool.m4 and ltmain.sh have a version mismatch! ***  
 *** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***  
   
 Please run:  
   
   libtoolize --copy --force  
   
 if appropriate, please contact the maintainer of this  
 package (or your distribution) for help.  
 ])  
 else  
   AC_MSG_RESULT(yes)  
 fi  
 ])# _LT_VERSION_CHECK  
   
   
 # _LT_AC_SYS_COMPILER  # _LT_AC_SYS_COMPILER
 # -------------------  # -------------------
 AC_DEFUN([_LT_AC_SYS_COMPILER],  AC_DEFUN([_LT_AC_SYS_COMPILER],
Line 1399
 
Line 1356
     esac      esac
     ;;      ;;
   
   linux*)  
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then  
       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'  
       supports_anon_versioning=no  
       case `$LD -v 2>/dev/null` in  
         *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11  
         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...  
         *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...  
         *\ 2.11.*) ;; # other 2.11 versions  
         *) supports_anon_versioning=yes ;;  
       esac  
       if test $supports_anon_versioning = yes; then  
         archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~  
 cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~  
 $echo "local: *; };" >> $output_objdir/$libname.ver~  
         $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'  
       else  
         $archive_expsym_cmds="$archive_cmds"  
       fi  
     else  
       ld_shlibs=no  
     fi  
     ;;  
   
   *)    *)
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'      library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
     ;;      ;;
Line 1487
 
Line 1420
     *) objformat=elf ;;      *) objformat=elf ;;
     esac      esac
   fi    fi
   # Handle Gentoo/FreeBSD as it was Linux    version_type=freebsd-$objformat
   case $host_vendor in  
     gentoo)  
       version_type=linux ;;  
     *)  
       version_type=freebsd-$objformat ;;  
   esac  
   
   case $version_type in    case $version_type in
     freebsd-elf*)      freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'        library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
Line 1505
 
Line 1431
       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'        library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
       need_version=yes        need_version=yes
       ;;        ;;
     linux)  
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'  
       soname_spec='${libname}${release}${shared_ext}$major'  
       need_lib_prefix=no  
       need_version=no  
       ;;  
   esac    esac
   shlibpath_var=LD_LIBRARY_PATH    shlibpath_var=LD_LIBRARY_PATH
   case $host_os in    case $host_os in
Line 1658
 
Line 1578
   # before this can be enabled.    # before this can be enabled.
   hardcode_into_libs=yes    hardcode_into_libs=yes
   
     # find out which ABI we are using
     libsuff=
     case "$host_cpu" in
     x86_64*|s390x*|powerpc64*)
       echo '[#]line __oline__ "configure"' > conftest.$ac_ext
       if AC_TRY_EVAL(ac_compile); then
         case `/usr/bin/file conftest.$ac_objext` in
         *64-bit*)
           libsuff=64
           sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
           ;;
         esac
       fi
       rm -rf conftest*
       ;;
     esac
   
   # Append ld.so.conf contents to the search path    # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then    if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`      lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"      sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
   fi    fi
   
   # We used to test for /lib/ld.so.1 and disable shared libraries on    # We used to test for /lib/ld.so.1 and disable shared libraries on


Legend:
line(s) removed in v.1.25 
line(s) changed
 line(s) added in v.1.26

File made using version 1.98 of cvs2html by leaf at 2011-07-21 16:53