aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/argz.m44
-rw-r--r--m4/libtool.m4128
-rw-r--r--m4/ltdl.m432
-rw-r--r--m4/ltoptions.m42
-rw-r--r--m4/ltsugar.m420
-rw-r--r--m4/ltversion.m410
6 files changed, 84 insertions, 112 deletions
diff --git a/m4/argz.m4 b/m4/argz.m4
index 37c1b11e4..edc99bbce 100644
--- a/m4/argz.m4
+++ b/m4/argz.m4
@@ -28,14 +28,14 @@ ARGZ_H=
28AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \ 28AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \
29 argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])]) 29 argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])])
30 30
31dnl if have system argz functions, allow forced use of 31dnl if have system argz functions, allow forced use of
32dnl libltdl-supplied implementation (and default to do so 32dnl libltdl-supplied implementation (and default to do so
33dnl on "known bad" systems). Could use a runtime check, but 33dnl on "known bad" systems). Could use a runtime check, but
34dnl (a) detecting malloc issues is notoriously unreliable 34dnl (a) detecting malloc issues is notoriously unreliable
35dnl (b) only known system that declares argz functions, 35dnl (b) only known system that declares argz functions,
36dnl provides them, yet they are broken, is cygwin 36dnl provides them, yet they are broken, is cygwin
37dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) 37dnl releases prior to 16-Mar-2007 (1.5.24 and earlier)
38dnl So, it's more straightforward simply to special case 38dnl So, it's more straightforward simply to special case
39dnl this for known bad systems. 39dnl this for known bad systems.
40AS_IF([test -z "$ARGZ_H"], 40AS_IF([test -z "$ARGZ_H"],
41 [AC_CACHE_CHECK( 41 [AC_CACHE_CHECK(
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 39ba996cb..4ceb7f128 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -380,12 +380,12 @@ m4_define([lt_decl_dquote_varnames],
380# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) 380# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
381# --------------------------------------------------- 381# ---------------------------------------------------
382m4_define([lt_decl_varnames_tagged], 382m4_define([lt_decl_varnames_tagged],
383[m4_assert([$# <= 2])dnl 383[_$0(m4_quote(m4_default([$1], [[, ]])),
384_$0(m4_quote(m4_default([$1], [[, ]])), 384 m4_quote(m4_if([$2], [],
385 m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), 385 m4_quote(lt_decl_tag_varnames),
386 m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) 386 m4_quote(m4_shift($@)))),
387m4_define([_lt_decl_varnames_tagged], 387 m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
388[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) 388m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
389 389
390 390
391# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) 391# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
@@ -945,10 +945,10 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
945 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 945 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
946 darwin1.*) 946 darwin1.*)
947 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 947 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
948 darwin*) # darwin 5.x on 948 darwin*) # darwin 5.x on
949 # if running on 10.5 or later, the deployment target defaults 949 # if running on 10.5 or later, the deployment target defaults
950 # to the OS version, if on x86, and 10.4, the deployment 950 # to the OS version, if on x86, and 10.4, the deployment
951 # target defaults to 10.4. Don't you love it? 951 # target defaults to 10.4. Don't you love it?
952 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 952 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
953 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) 953 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
954 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 954 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
@@ -990,11 +990,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
990 _LT_TAGVAR(whole_archive_flag_spec, $1)='' 990 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
991 _LT_TAGVAR(link_all_deplibs, $1)=yes 991 _LT_TAGVAR(link_all_deplibs, $1)=yes
992 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" 992 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
993 case $cc_basename in 993 if test "$GCC" = "yes"; then
994 ifort*) _lt_dar_can_shared=yes ;;
995 *) _lt_dar_can_shared=$GCC ;;
996 esac
997 if test "$_lt_dar_can_shared" = "yes"; then
998 output_verbose_link_cmd=echo 994 output_verbose_link_cmd=echo
999 _LT_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}" 995 _LT_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}"
1000 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 996 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@ -1516,7 +1512,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1516 lt_cv_sys_max_cmd_len=-1; 1512 lt_cv_sys_max_cmd_len=-1;
1517 ;; 1513 ;;
1518 1514
1519 cygwin* | mingw* | cegcc*) 1515 cygwin* | mingw*)
1520 # On Win9x/ME, this test blows up -- it succeeds, but takes 1516 # On Win9x/ME, this test blows up -- it succeeds, but takes
1521 # about 5 minutes as the teststring grows exponentially. 1517 # about 5 minutes as the teststring grows exponentially.
1522 # Worse, since 9x/ME are not pre-emptively multitasking, 1518 # Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1684,6 +1680,10 @@ else
1684# endif 1680# endif
1685#endif 1681#endif
1686 1682
1683#ifdef __cplusplus
1684extern "C" void exit (int);
1685#endif
1686
1687void fnord() { int i=42;} 1687void fnord() { int i=42;}
1688int main () 1688int main ()
1689{ 1689{
@@ -1699,7 +1699,7 @@ int main ()
1699 else 1699 else
1700 puts (dlerror ()); 1700 puts (dlerror ());
1701 1701
1702 return status; 1702 exit (status);
1703}] 1703}]
1704_LT_EOF 1704_LT_EOF
1705 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then 1705 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -1738,7 +1738,7 @@ else
1738 lt_cv_dlopen_self=yes 1738 lt_cv_dlopen_self=yes
1739 ;; 1739 ;;
1740 1740
1741 mingw* | pw32* | cegcc*) 1741 mingw* | pw32*)
1742 lt_cv_dlopen="LoadLibrary" 1742 lt_cv_dlopen="LoadLibrary"
1743 lt_cv_dlopen_libs= 1743 lt_cv_dlopen_libs=
1744 ;; 1744 ;;
@@ -2035,7 +2035,6 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],
2035[AC_REQUIRE([AC_CANONICAL_HOST])dnl 2035[AC_REQUIRE([AC_CANONICAL_HOST])dnl
2036m4_require([_LT_DECL_EGREP])dnl 2036m4_require([_LT_DECL_EGREP])dnl
2037m4_require([_LT_FILEUTILS_DEFAULTS])dnl 2037m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2038m4_require([_LT_DECL_OBJDUMP])dnl
2039m4_require([_LT_DECL_SED])dnl 2038m4_require([_LT_DECL_SED])dnl
2040AC_MSG_CHECKING([dynamic linker characteristics]) 2039AC_MSG_CHECKING([dynamic linker characteristics])
2041m4_if([$1], 2040m4_if([$1],
@@ -2200,14 +2199,14 @@ bsdi[[45]]*)
2200 # libtool to hard-code these into programs 2199 # libtool to hard-code these into programs
2201 ;; 2200 ;;
2202 2201
2203cygwin* | mingw* | pw32* | cegcc*) 2202cygwin* | mingw* | pw32*)
2204 version_type=windows 2203 version_type=windows
2205 shrext_cmds=".dll" 2204 shrext_cmds=".dll"
2206 need_version=no 2205 need_version=no
2207 need_lib_prefix=no 2206 need_lib_prefix=no
2208 2207
2209 case $GCC,$host_os in 2208 case $GCC,$host_os in
2210 yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) 2209 yes,cygwin* | yes,mingw* | yes,pw32*)
2211 library_names_spec='$libname.dll.a' 2210 library_names_spec='$libname.dll.a'
2212 # DLL is installed to $(libdir)/../bin by postinstall_cmds 2211 # DLL is installed to $(libdir)/../bin by postinstall_cmds
2213 postinstall_cmds='base_file=`basename \${file}`~ 2212 postinstall_cmds='base_file=`basename \${file}`~
@@ -2230,7 +2229,7 @@ cygwin* | mingw* | pw32* | cegcc*)
2230 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2229 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2231 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" 2230 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
2232 ;; 2231 ;;
2233 mingw* | cegcc*) 2232 mingw*)
2234 # MinGW DLLs use traditional 'lib' prefix 2233 # MinGW DLLs use traditional 'lib' prefix
2235 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2234 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2236 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` 2235 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
@@ -2656,7 +2655,7 @@ tpf*)
2656 version_type=linux 2655 version_type=linux
2657 need_lib_prefix=no 2656 need_lib_prefix=no
2658 need_version=no 2657 need_version=no
2659 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 2658 library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2660 shlibpath_var=LD_LIBRARY_PATH 2659 shlibpath_var=LD_LIBRARY_PATH
2661 shlibpath_overrides_runpath=no 2660 shlibpath_overrides_runpath=no
2662 hardcode_into_libs=yes 2661 hardcode_into_libs=yes
@@ -2680,7 +2679,7 @@ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
2680if test "$GCC" = yes; then 2679if test "$GCC" = yes; then
2681 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 2680 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
2682fi 2681fi
2683 2682
2684if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 2683if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
2685 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 2684 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
2686fi 2685fi
@@ -2957,7 +2956,6 @@ _LT_DECL([], [reload_cmds], [2])dnl
2957# -- PORTME fill in with the dynamic library characteristics 2956# -- PORTME fill in with the dynamic library characteristics
2958m4_defun([_LT_CHECK_MAGIC_METHOD], 2957m4_defun([_LT_CHECK_MAGIC_METHOD],
2959[m4_require([_LT_DECL_EGREP]) 2958[m4_require([_LT_DECL_EGREP])
2960m4_require([_LT_DECL_OBJDUMP])
2961AC_CACHE_CHECK([how to recognize dependent libraries], 2959AC_CACHE_CHECK([how to recognize dependent libraries],
2962lt_cv_deplibs_check_method, 2960lt_cv_deplibs_check_method,
2963[lt_cv_file_magic_cmd='$MAGIC_CMD' 2961[lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -3008,12 +3006,6 @@ mingw* | pw32*)
3008 fi 3006 fi
3009 ;; 3007 ;;
3010 3008
3011cegcc)
3012 # use the weaker test based on 'objdump'. See mingw*.
3013 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
3014 lt_cv_file_magic_cmd='$OBJDUMP -f'
3015 ;;
3016
3017darwin* | rhapsody*) 3009darwin* | rhapsody*)
3018 lt_cv_deplibs_check_method=pass_all 3010 lt_cv_deplibs_check_method=pass_all
3019 ;; 3011 ;;
@@ -3325,7 +3317,7 @@ case $host_os in
3325aix*) 3317aix*)
3326 symcode='[[BCDT]]' 3318 symcode='[[BCDT]]'
3327 ;; 3319 ;;
3328cygwin* | mingw* | pw32* | cegcc*) 3320cygwin* | mingw* | pw32*)
3329 symcode='[[ABCDGISTW]]' 3321 symcode='[[ABCDGISTW]]'
3330 ;; 3322 ;;
3331hpux*) 3323hpux*)
@@ -3571,7 +3563,7 @@ m4_if([$1], [CXX], [
3571 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 3563 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
3572 # PIC is the default for these OSes. 3564 # PIC is the default for these OSes.
3573 ;; 3565 ;;
3574 mingw* | cygwin* | os2* | pw32* | cegcc*) 3566 mingw* | cygwin* | os2* | pw32*)
3575 # This hack is so that the source file can tell whether it is being 3567 # This hack is so that the source file can tell whether it is being
3576 # built for inclusion in a dll (and should export symbols for example). 3568 # built for inclusion in a dll (and should export symbols for example).
3577 # Although the cygwin gcc ignores -fPIC, still need this for old-style 3569 # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3598,11 +3590,10 @@ m4_if([$1], [CXX], [
3598 fi 3590 fi
3599 ;; 3591 ;;
3600 hpux*) 3592 hpux*)
3601 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit 3593 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
3602 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag 3594 # not for PA HP-UX.
3603 # sets the default TLS model and affects inlining.
3604 case $host_cpu in 3595 case $host_cpu in
3605 hppa*64*) 3596 hppa*64*|ia64*)
3606 ;; 3597 ;;
3607 *) 3598 *)
3608 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 3599 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
@@ -3700,19 +3691,12 @@ m4_if([$1], [CXX], [
3700 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' 3691 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
3701 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 3692 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3702 ;; 3693 ;;
3703 ecpc* ) 3694 icpc* | ecpc* )
3704 # old Intel C++ for x86_64 which still supported -KPIC. 3695 # Intel C++
3705 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3696 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3706 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 3697 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3707 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 3698 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3708 ;; 3699 ;;
3709 icpc* )
3710 # Intel C++, used to be incompatible with GCC.
3711 # ICC 10 doesn't accept -KPIC any more.
3712 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3713 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3714 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3715 ;;
3716 pgCC* | pgcpp*) 3700 pgCC* | pgcpp*)
3717 # Portland Group C++ compiler 3701 # Portland Group C++ compiler
3718 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3702 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -3878,7 +3862,7 @@ m4_if([$1], [CXX], [
3878 # PIC is the default for these OSes. 3862 # PIC is the default for these OSes.
3879 ;; 3863 ;;
3880 3864
3881 mingw* | cygwin* | pw32* | os2* | cegcc*) 3865 mingw* | cygwin* | pw32* | os2*)
3882 # This hack is so that the source file can tell whether it is being 3866 # This hack is so that the source file can tell whether it is being
3883 # built for inclusion in a dll (and should export symbols for example). 3867 # built for inclusion in a dll (and should export symbols for example).
3884 # Although the cygwin gcc ignores -fPIC, still need this for old-style 3868 # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3894,11 +3878,10 @@ m4_if([$1], [CXX], [
3894 ;; 3878 ;;
3895 3879
3896 hpux*) 3880 hpux*)
3897 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit 3881 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
3898 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag 3882 # not for PA HP-UX.
3899 # sets the default TLS model and affects inlining.
3900 case $host_cpu in 3883 case $host_cpu in
3901 hppa*64*) 3884 hppa*64*|ia64*)
3902 # +Z the default 3885 # +Z the default
3903 ;; 3886 ;;
3904 *) 3887 *)
@@ -3948,7 +3931,7 @@ m4_if([$1], [CXX], [
3948 fi 3931 fi
3949 ;; 3932 ;;
3950 3933
3951 mingw* | cygwin* | pw32* | os2* | cegcc*) 3934 mingw* | cygwin* | pw32* | os2*)
3952 # This hack is so that the source file can tell whether it is being 3935 # This hack is so that the source file can tell whether it is being
3953 # built for inclusion in a dll (and should export symbols for example). 3936 # built for inclusion in a dll (and should export symbols for example).
3954 m4_if([$1], [GCJ], [], 3937 m4_if([$1], [GCJ], [],
@@ -3979,25 +3962,11 @@ m4_if([$1], [CXX], [
3979 3962
3980 linux* | k*bsd*-gnu) 3963 linux* | k*bsd*-gnu)
3981 case $cc_basename in 3964 case $cc_basename in
3982 # old Intel for x86_64 which still supported -KPIC. 3965 icc* | ecc* | ifort*)
3983 ecc*)
3984 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3966 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3985 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 3967 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3986 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 3968 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3987 ;; 3969 ;;
3988 # icc used to be incompatible with GCC.
3989 # ICC 10 doesn't accept -KPIC any more.
3990 icc* | ifort*)
3991 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3992 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3993 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3994 ;;
3995 # Lahey Fortran 8.1.
3996 lf95*)
3997 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3998 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
3999 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
4000 ;;
4001 pgcc* | pgf77* | pgf90* | pgf95*) 3970 pgcc* | pgf77* | pgf90* | pgf95*)
4002 # Portland Group compilers (*not* the Pentium gcc compiler, 3971 # Portland Group compilers (*not* the Pentium gcc compiler,
4003 # which looks to be a dead project) 3972 # which looks to be a dead project)
@@ -4179,7 +4148,7 @@ m4_if([$1], [CXX], [
4179 pw32*) 4148 pw32*)
4180 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 4149 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
4181 ;; 4150 ;;
4182 cygwin* | mingw* | cegcc*) 4151 cygwin* | mingw*)
4183 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' 4152 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
4184 ;; 4153 ;;
4185 *) 4154 *)
@@ -4231,7 +4200,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
4231 extract_expsyms_cmds= 4200 extract_expsyms_cmds=
4232 4201
4233 case $host_os in 4202 case $host_os in
4234 cygwin* | mingw* | pw32* | cegcc*) 4203 cygwin* | mingw* | pw32*)
4235 # FIXME: the MSVC++ port hasn't been tested in a loooong time 4204 # FIXME: the MSVC++ port hasn't been tested in a loooong time
4236 # When not using gcc, we currently assume that we are using 4205 # When not using gcc, we currently assume that we are using
4237 # Microsoft Visual C++. 4206 # Microsoft Visual C++.
@@ -4318,7 +4287,7 @@ _LT_EOF
4318 fi 4287 fi
4319 ;; 4288 ;;
4320 4289
4321 cygwin* | mingw* | pw32* | cegcc*) 4290 cygwin* | mingw* | pw32*)
4322 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 4291 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
4323 # as there is no search path for DLLs. 4292 # as there is no search path for DLLs.
4324 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 4293 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -4384,9 +4353,6 @@ _LT_EOF
4384 tmp_addflag=' -i_dynamic -nofor_main' ;; 4353 tmp_addflag=' -i_dynamic -nofor_main' ;;
4385 ifc* | ifort*) # Intel Fortran compiler 4354 ifc* | ifort*) # Intel Fortran compiler
4386 tmp_addflag=' -nofor_main' ;; 4355 tmp_addflag=' -nofor_main' ;;
4387 lf95*) # Lahey Fortran 8.1
4388 _LT_TAGVAR(whole_archive_flag_spec, $1)=
4389 tmp_sharedflag='--shared' ;;
4390 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) 4356 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4391 tmp_sharedflag='-qmkshrobj' 4357 tmp_sharedflag='-qmkshrobj'
4392 tmp_addflag= ;; 4358 tmp_addflag= ;;
@@ -4618,7 +4584,6 @@ _LT_EOF
4618 fi 4584 fi
4619 fi 4585 fi
4620 4586
4621 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
4622 # It seems that -bexpall does not export symbols beginning with 4587 # It seems that -bexpall does not export symbols beginning with
4623 # underscore (_), so it is better to generate a list of symbols to export. 4588 # underscore (_), so it is better to generate a list of symbols to export.
4624 _LT_TAGVAR(always_export_symbols, $1)=yes 4589 _LT_TAGVAR(always_export_symbols, $1)=yes
@@ -4673,7 +4638,7 @@ _LT_EOF
4673 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic 4638 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
4674 ;; 4639 ;;
4675 4640
4676 cygwin* | mingw* | pw32* | cegcc*) 4641 cygwin* | mingw* | pw32*)
4677 # When not using gcc, we currently assume that we are using 4642 # When not using gcc, we currently assume that we are using
4678 # Microsoft Visual C++. 4643 # Microsoft Visual C++.
4679 # hardcode_libdir_flag_spec is actually meaningless, as there is 4644 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -4777,7 +4742,7 @@ _LT_EOF
4777 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4742 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4778 ;; 4743 ;;
4779 ia64*) 4744 ia64*)
4780 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 4745 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4781 ;; 4746 ;;
4782 *) 4747 *)
4783 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4748 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -5562,7 +5527,6 @@ if test "$_lt_caught_CXX_error" != yes; then
5562 fi 5527 fi
5563 fi 5528 fi
5564 5529
5565 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
5566 # It seems that -bexpall does not export symbols beginning with 5530 # It seems that -bexpall does not export symbols beginning with
5567 # underscore (_), so it is better to generate a list of symbols to 5531 # underscore (_), so it is better to generate a list of symbols to
5568 # export. 5532 # export.
@@ -5621,7 +5585,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5621 esac 5585 esac
5622 ;; 5586 ;;
5623 5587
5624 cygwin* | mingw* | pw32* | cegcc*) 5588 cygwin* | mingw* | pw32*)
5625 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 5589 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
5626 # as there is no search path for DLLs. 5590 # as there is no search path for DLLs.
5627 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 5591 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -7006,18 +6970,6 @@ AC_SUBST([GREP])
7006]) 6970])
7007 6971
7008 6972
7009# _LT_DECL_OBJDUMP
7010# --------------
7011# If we don't have a new enough Autoconf to choose the best objdump
7012# available, choose the one first in the user's PATH.
7013m4_defun([_LT_DECL_OBJDUMP],
7014[AC_CHECK_TOOL(OBJDUMP, objdump, false)
7015test -z "$OBJDUMP" && OBJDUMP=objdump
7016_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
7017AC_SUBST([OBJDUMP])
7018])
7019
7020
7021# _LT_DECL_SED 6973# _LT_DECL_SED
7022# ------------ 6974# ------------
7023# Check for a fully-functional sed program, that truncates 6975# Check for a fully-functional sed program, that truncates
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index f6be54a94..6c277b4b3 100644
--- a/m4/ltdl.m4
+++ b/m4/ltdl.m4
@@ -7,7 +7,7 @@
7# unlimited permission to copy and/or distribute it, with or without 7# unlimited permission to copy and/or distribute it, with or without
8# modifications, as long as this notice is preserved. 8# modifications, as long as this notice is preserved.
9 9
10# serial 17 LTDL_INIT 10# serial 15 LTDL_INIT
11 11
12# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) 12# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
13# ------------------------------------------ 13# ------------------------------------------
@@ -212,10 +212,26 @@ m4_define([$0], [])
212# of into LIBOBJS. 212# of into LIBOBJS.
213AC_DEFUN([_LT_LIBOBJ], [ 213AC_DEFUN([_LT_LIBOBJ], [
214 m4_pattern_allow([^_LT_LIBOBJS$]) 214 m4_pattern_allow([^_LT_LIBOBJS$])
215 AS_LITERAL_IF([$1], [_LT_LIBSOURCES([$1.c])])dnl
215 _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" 216 _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
216])# _LT_LIBOBJS 217])# _LT_LIBOBJS
217 218
218 219
220# _LT_LIBSOURCES(MODULE_NAMES)
221# ----------------------------
222# Like AC_LIBSOURCES, except the directory where the libltdl source files
223# are expected is distinct from the user LIBOBJ directory.
224AC_DEFUN([_LT_LIBSOURCES], [
225 m4_foreach([_LTNAME], [$1], [
226 m4_syscmd([test -r "$lt_libobj_prefix]_LTNAME[" ||
227 test -z "$lt_libobj_prefix" ||
228 test ! -d "$lt_libobj_prefix"])dnl
229 m4_if(m4_sysval, [0], [],
230 [AC_FATAL([missing $lt_libobj_prefix/]_LTNAME)])
231 ])
232])# _LT_LIBSOURCES
233
234
219# LTDL_INIT([OPTIONS]) 235# LTDL_INIT([OPTIONS])
220# -------------------- 236# --------------------
221# Clients of libltdl can use this macro to allow the installer to 237# Clients of libltdl can use this macro to allow the installer to
@@ -229,9 +245,9 @@ _LT_SET_OPTIONS([$0], [$1])
229 245
230dnl We need to keep our own list of libobjs separate from our parent project, 246dnl We need to keep our own list of libobjs separate from our parent project,
231dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while 247dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
232dnl we look for our own LIBOBJs. 248dnl we look for our own LIBOBJs. Definitions in ltdl-libobj.m4.
233m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) 249m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
234m4_pushdef([AC_LIBSOURCES]) 250m4_pushdef([AC_LIBSOURCES], m4_defn([_LT_LIBSOURCES]))
235 251
236dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: 252dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
237m4_if(_LTDL_MODE, [], 253m4_if(_LTDL_MODE, [],
@@ -248,7 +264,7 @@ if test "x$with_included_ltdl" != xyes; then
248 # decide whether there is a useful installed version we can use. 264 # decide whether there is a useful installed version we can use.
249 AC_CHECK_HEADER([ltdl.h], 265 AC_CHECK_HEADER([ltdl.h],
250 [AC_CHECK_DECL([lt_dlinterface_register], 266 [AC_CHECK_DECL([lt_dlinterface_register],
251 [AC_CHECK_LIB([ltdl], [lt_dladvise_preload], 267 [AC_CHECK_LIB([ltdl], [lt_dlinterface_register],
252 [with_included_ltdl=no], 268 [with_included_ltdl=no],
253 [with_included_ltdl=yes])], 269 [with_included_ltdl=yes])],
254 [with_included_ltdl=yes], 270 [with_included_ltdl=yes],
@@ -380,6 +396,12 @@ m4_require([_LT_HEADER_DLFCN])dnl
380m4_require([_LT_CHECK_DLPREOPEN])dnl 396m4_require([_LT_CHECK_DLPREOPEN])dnl
381m4_require([_LT_DECL_SED])dnl 397m4_require([_LT_DECL_SED])dnl
382 398
399# lt_cv_dlopen_self gets defined by LT_SYS_DLOPEN_SELF, called by LT_INIT
400if test "$lt_cv_dlopen_self" = yes; then
401 AC_DEFINE([LTDL_DLOPEN_SELF_WORKS], [1],
402 [Define if dlopen(NULL) is able to resolve symbols from the main program.])
403fi
404
383dnl Don't require this, or it will be expanded earlier than the code 405dnl Don't require this, or it will be expanded earlier than the code
384dnl that sets the variables it relies on: 406dnl that sets the variables it relies on:
385_LT_ENABLE_INSTALL 407_LT_ENABLE_INSTALL
@@ -407,8 +429,6 @@ AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
407AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) 429AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
408AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) 430AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
409 431
410AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
411
412name=ltdl 432name=ltdl
413LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` 433LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
414AC_SUBST([LTDLOPEN]) 434AC_SUBST([LTDLOPEN])
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 34151a3ba..e97011948 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -125,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
125[enable_win32_dll=yes 125[enable_win32_dll=yes
126 126
127case $host in 127case $host in
128*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) 128*-*-cygwin* | *-*-mingw* | *-*-pw32*)
129 AC_CHECK_TOOL(AS, as, false) 129 AC_CHECK_TOOL(AS, as, false)
130 AC_CHECK_TOOL(DLLTOOL, dlltool, false) 130 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
131 AC_CHECK_TOOL(OBJDUMP, objdump, false) 131 AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a057d..0d258e070 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,13 +1,13 @@
1# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- 1# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
2# 2#
3# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. 3# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
4# Written by Gary V. Vaughan, 2004 4# Written by Gary V. Vaughan, 2004
5# 5#
6# This file is free software; the Free Software Foundation gives 6# This file is free software; the Free Software Foundation gives
7# unlimited permission to copy and/or distribute it, with or without 7# unlimited permission to copy and/or distribute it, with or without
8# modifications, as long as this notice is preserved. 8# modifications, as long as this notice is preserved.
9 9
10# serial 6 ltsugar.m4 10# serial 5 ltsugar.m4
11 11
12# This is to help aclocal find these macros, as it can't see m4_define. 12# This is to help aclocal find these macros, as it can't see m4_define.
13AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) 13AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
@@ -63,14 +63,14 @@ m4_define([lt_append],
63# Produce a SEP delimited list of all paired combinations of elements of 63# Produce a SEP delimited list of all paired combinations of elements of
64# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list 64# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
65# has the form PREFIXmINFIXSUFFIXn. 65# has the form PREFIXmINFIXSUFFIXn.
66# Needed until we can rely on m4_combine added in Autoconf 2.62.
67m4_define([lt_combine], 66m4_define([lt_combine],
68[m4_if(m4_eval([$# > 3]), [1], 67[m4_if([$2], [], [],
69 [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl 68 [m4_if([$4], [], [],
70[[m4_foreach([_Lt_prefix], [$2], 69 [lt_join(m4_quote(m4_default([$1], [[, ]])),
71 [m4_foreach([_Lt_suffix], 70 lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],
72 ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, 71 [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),
73 [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) 72 [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl
73])
74 74
75 75
76# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) 76# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index b8e154fe6..45cb1557c 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -9,15 +9,15 @@
9 9
10# Generated from ltversion.in. 10# Generated from ltversion.in.
11 11
12# serial 3012 ltversion.m4 12# serial 2976 ltversion.m4
13# This file is part of GNU Libtool 13# This file is part of GNU Libtool
14 14
15m4_define([LT_PACKAGE_VERSION], [2.2.6]) 15m4_define([LT_PACKAGE_VERSION], [2.2.4])
16m4_define([LT_PACKAGE_REVISION], [1.3012]) 16m4_define([LT_PACKAGE_REVISION], [1.2976])
17 17
18AC_DEFUN([LTVERSION_VERSION], 18AC_DEFUN([LTVERSION_VERSION],
19[macro_version='2.2.6' 19[macro_version='2.2.4'
20macro_revision='1.3012' 20macro_revision='1.2976'
21_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) 21_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
22_LT_DECL(, macro_revision, 0) 22_LT_DECL(, macro_revision, 0)
23]) 23])