aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2009-06-28 17:08:07 +0000
committerChristian Grothoff <christian@grothoff.org>2009-06-28 17:08:07 +0000
commit3e719ecc0f2252bfb01ce6ee057e6d63dd4b7037 (patch)
tree613635d211366eda3ac83eccee08f49e78e125e5 /m4
parenta913b5f73410eb3f0568670046d3ecf3b233744f (diff)
downloadgnunet-3e719ecc0f2252bfb01ce6ee057e6d63dd4b7037.tar.gz
gnunet-3e719ecc0f2252bfb01ce6ee057e6d63dd4b7037.zip
airplane hackery
Diffstat (limited to 'm4')
-rw-r--r--m4/argz.m44
-rw-r--r--m4/libtool.m4131
-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, 115 insertions, 84 deletions
diff --git a/m4/argz.m4 b/m4/argz.m4
index edc99bbce..37c1b11e4 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 6e86e5b43..1e7ea47c0 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[_$0(m4_quote(m4_default([$1], [[, ]])), 383[m4_assert([$# <= 2])dnl
384 m4_quote(m4_if([$2], [], 384_$0(m4_quote(m4_default([$1], [[, ]])),
385 m4_quote(lt_decl_tag_varnames), 385 m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
386 m4_quote(m4_shift($@)))), 386 m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
387 m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) 387m4_define([_lt_decl_varnames_tagged],
388m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) 388[m4_ifval([$3], [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,7 +990,11 @@ 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 if test "$GCC" = "yes"; then 993 case $cc_basename in
994 ifort*) _lt_dar_can_shared=yes ;;
995 *) _lt_dar_can_shared=$GCC ;;
996 esac
997 if test "$_lt_dar_can_shared" = "yes"; then
994 output_verbose_link_cmd=echo 998 output_verbose_link_cmd=echo
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}" 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}"
996 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 1000 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@ -1512,7 +1516,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1512 lt_cv_sys_max_cmd_len=-1; 1516 lt_cv_sys_max_cmd_len=-1;
1513 ;; 1517 ;;
1514 1518
1515 cygwin* | mingw*) 1519 cygwin* | mingw* | cegcc*)
1516 # On Win9x/ME, this test blows up -- it succeeds, but takes 1520 # On Win9x/ME, this test blows up -- it succeeds, but takes
1517 # about 5 minutes as the teststring grows exponentially. 1521 # about 5 minutes as the teststring grows exponentially.
1518 # Worse, since 9x/ME are not pre-emptively multitasking, 1522 # Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1680,10 +1684,6 @@ else
1680# endif 1684# endif
1681#endif 1685#endif
1682 1686
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 exit (status); 1702 return 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*) 1741 mingw* | pw32* | cegcc*)
1742 lt_cv_dlopen="LoadLibrary" 1742 lt_cv_dlopen="LoadLibrary"
1743 lt_cv_dlopen_libs= 1743 lt_cv_dlopen_libs=
1744 ;; 1744 ;;
@@ -2035,6 +2035,7 @@ 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
2038m4_require([_LT_DECL_SED])dnl 2039m4_require([_LT_DECL_SED])dnl
2039AC_MSG_CHECKING([dynamic linker characteristics]) 2040AC_MSG_CHECKING([dynamic linker characteristics])
2040m4_if([$1], 2041m4_if([$1],
@@ -2199,14 +2200,14 @@ bsdi[[45]]*)
2199 # libtool to hard-code these into programs 2200 # libtool to hard-code these into programs
2200 ;; 2201 ;;
2201 2202
2202cygwin* | mingw* | pw32*) 2203cygwin* | mingw* | pw32* | cegcc*)
2203 version_type=windows 2204 version_type=windows
2204 shrext_cmds=".dll" 2205 shrext_cmds=".dll"
2205 need_version=no 2206 need_version=no
2206 need_lib_prefix=no 2207 need_lib_prefix=no
2207 2208
2208 case $GCC,$host_os in 2209 case $GCC,$host_os in
2209 yes,cygwin* | yes,mingw* | yes,pw32*) 2210 yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
2210 library_names_spec='$libname.dll.a' 2211 library_names_spec='$libname.dll.a'
2211 # DLL is installed to $(libdir)/../bin by postinstall_cmds 2212 # DLL is installed to $(libdir)/../bin by postinstall_cmds
2212 postinstall_cmds='base_file=`basename \${file}`~ 2213 postinstall_cmds='base_file=`basename \${file}`~
@@ -2229,7 +2230,7 @@ cygwin* | mingw* | pw32*)
2229 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2230 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2230 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" 2231 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
2231 ;; 2232 ;;
2232 mingw*) 2233 mingw* | cegcc*)
2233 # MinGW DLLs use traditional 'lib' prefix 2234 # MinGW DLLs use traditional 'lib' prefix
2234 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2235 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2235 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` 2236 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
@@ -2667,7 +2668,7 @@ tpf*)
2667 version_type=linux 2668 version_type=linux
2668 need_lib_prefix=no 2669 need_lib_prefix=no
2669 need_version=no 2670 need_version=no
2670 library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 2671 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2671 shlibpath_var=LD_LIBRARY_PATH 2672 shlibpath_var=LD_LIBRARY_PATH
2672 shlibpath_overrides_runpath=no 2673 shlibpath_overrides_runpath=no
2673 hardcode_into_libs=yes 2674 hardcode_into_libs=yes
@@ -2691,7 +2692,7 @@ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
2691if test "$GCC" = yes; then 2692if test "$GCC" = yes; then
2692 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 2693 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
2693fi 2694fi
2694 2695
2695if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 2696if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
2696 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 2697 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
2697fi 2698fi
@@ -2968,6 +2969,7 @@ _LT_DECL([], [reload_cmds], [2])dnl
2968# -- PORTME fill in with the dynamic library characteristics 2969# -- PORTME fill in with the dynamic library characteristics
2969m4_defun([_LT_CHECK_MAGIC_METHOD], 2970m4_defun([_LT_CHECK_MAGIC_METHOD],
2970[m4_require([_LT_DECL_EGREP]) 2971[m4_require([_LT_DECL_EGREP])
2972m4_require([_LT_DECL_OBJDUMP])
2971AC_CACHE_CHECK([how to recognize dependent libraries], 2973AC_CACHE_CHECK([how to recognize dependent libraries],
2972lt_cv_deplibs_check_method, 2974lt_cv_deplibs_check_method,
2973[lt_cv_file_magic_cmd='$MAGIC_CMD' 2975[lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -3018,6 +3020,12 @@ mingw* | pw32*)
3018 fi 3020 fi
3019 ;; 3021 ;;
3020 3022
3023cegcc)
3024 # use the weaker test based on 'objdump'. See mingw*.
3025 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
3026 lt_cv_file_magic_cmd='$OBJDUMP -f'
3027 ;;
3028
3021darwin* | rhapsody*) 3029darwin* | rhapsody*)
3022 lt_cv_deplibs_check_method=pass_all 3030 lt_cv_deplibs_check_method=pass_all
3023 ;; 3031 ;;
@@ -3329,7 +3337,7 @@ case $host_os in
3329aix*) 3337aix*)
3330 symcode='[[BCDT]]' 3338 symcode='[[BCDT]]'
3331 ;; 3339 ;;
3332cygwin* | mingw* | pw32*) 3340cygwin* | mingw* | pw32* | cegcc*)
3333 symcode='[[ABCDGISTW]]' 3341 symcode='[[ABCDGISTW]]'
3334 ;; 3342 ;;
3335hpux*) 3343hpux*)
@@ -3575,7 +3583,7 @@ m4_if([$1], [CXX], [
3575 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 3583 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
3576 # PIC is the default for these OSes. 3584 # PIC is the default for these OSes.
3577 ;; 3585 ;;
3578 mingw* | cygwin* | os2* | pw32*) 3586 mingw* | cygwin* | os2* | pw32* | cegcc*)
3579 # This hack is so that the source file can tell whether it is being 3587 # This hack is so that the source file can tell whether it is being
3580 # built for inclusion in a dll (and should export symbols for example). 3588 # built for inclusion in a dll (and should export symbols for example).
3581 # Although the cygwin gcc ignores -fPIC, still need this for old-style 3589 # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3602,10 +3610,11 @@ m4_if([$1], [CXX], [
3602 fi 3610 fi
3603 ;; 3611 ;;
3604 hpux*) 3612 hpux*)
3605 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 3613 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
3606 # not for PA HP-UX. 3614 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
3615 # sets the default TLS model and affects inlining.
3607 case $host_cpu in 3616 case $host_cpu in
3608 hppa*64*|ia64*) 3617 hppa*64*)
3609 ;; 3618 ;;
3610 *) 3619 *)
3611 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 3620 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
@@ -3703,12 +3712,19 @@ m4_if([$1], [CXX], [
3703 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' 3712 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
3704 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 3713 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3705 ;; 3714 ;;
3706 icpc* | ecpc* ) 3715 ecpc* )
3707 # Intel C++ 3716 # old Intel C++ for x86_64 which still supported -KPIC.
3708 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3717 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3709 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 3718 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3710 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 3719 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3711 ;; 3720 ;;
3721 icpc* )
3722 # Intel C++, used to be incompatible with GCC.
3723 # ICC 10 doesn't accept -KPIC any more.
3724 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3725 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3726 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3727 ;;
3712 pgCC* | pgcpp*) 3728 pgCC* | pgcpp*)
3713 # Portland Group C++ compiler 3729 # Portland Group C++ compiler
3714 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3730 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -3874,7 +3890,7 @@ m4_if([$1], [CXX], [
3874 # PIC is the default for these OSes. 3890 # PIC is the default for these OSes.
3875 ;; 3891 ;;
3876 3892
3877 mingw* | cygwin* | pw32* | os2*) 3893 mingw* | cygwin* | pw32* | os2* | cegcc*)
3878 # This hack is so that the source file can tell whether it is being 3894 # This hack is so that the source file can tell whether it is being
3879 # built for inclusion in a dll (and should export symbols for example). 3895 # built for inclusion in a dll (and should export symbols for example).
3880 # Although the cygwin gcc ignores -fPIC, still need this for old-style 3896 # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3890,10 +3906,11 @@ m4_if([$1], [CXX], [
3890 ;; 3906 ;;
3891 3907
3892 hpux*) 3908 hpux*)
3893 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 3909 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
3894 # not for PA HP-UX. 3910 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
3911 # sets the default TLS model and affects inlining.
3895 case $host_cpu in 3912 case $host_cpu in
3896 hppa*64*|ia64*) 3913 hppa*64*)
3897 # +Z the default 3914 # +Z the default
3898 ;; 3915 ;;
3899 *) 3916 *)
@@ -3943,7 +3960,7 @@ m4_if([$1], [CXX], [
3943 fi 3960 fi
3944 ;; 3961 ;;
3945 3962
3946 mingw* | cygwin* | pw32* | os2*) 3963 mingw* | cygwin* | pw32* | os2* | cegcc*)
3947 # This hack is so that the source file can tell whether it is being 3964 # This hack is so that the source file can tell whether it is being
3948 # built for inclusion in a dll (and should export symbols for example). 3965 # built for inclusion in a dll (and should export symbols for example).
3949 m4_if([$1], [GCJ], [], 3966 m4_if([$1], [GCJ], [],
@@ -3974,11 +3991,25 @@ m4_if([$1], [CXX], [
3974 3991
3975 linux* | k*bsd*-gnu) 3992 linux* | k*bsd*-gnu)
3976 case $cc_basename in 3993 case $cc_basename in
3977 icc* | ecc* | ifort*) 3994 # old Intel for x86_64 which still supported -KPIC.
3995 ecc*)
3978 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3996 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3979 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 3997 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3980 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 3998 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3981 ;; 3999 ;;
4000 # icc used to be incompatible with GCC.
4001 # ICC 10 doesn't accept -KPIC any more.
4002 icc* | ifort*)
4003 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4004 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4005 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4006 ;;
4007 # Lahey Fortran 8.1.
4008 lf95*)
4009 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4010 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
4011 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
4012 ;;
3982 pgcc* | pgf77* | pgf90* | pgf95*) 4013 pgcc* | pgf77* | pgf90* | pgf95*)
3983 # Portland Group compilers (*not* the Pentium gcc compiler, 4014 # Portland Group compilers (*not* the Pentium gcc compiler,
3984 # which looks to be a dead project) 4015 # which looks to be a dead project)
@@ -4160,7 +4191,7 @@ m4_if([$1], [CXX], [
4160 pw32*) 4191 pw32*)
4161 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 4192 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
4162 ;; 4193 ;;
4163 cygwin* | mingw*) 4194 cygwin* | mingw* | cegcc*)
4164 _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' 4195 _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'
4165 ;; 4196 ;;
4166 linux* | k*bsd*-gnu) 4197 linux* | k*bsd*-gnu)
@@ -4215,7 +4246,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
4215 extract_expsyms_cmds= 4246 extract_expsyms_cmds=
4216 4247
4217 case $host_os in 4248 case $host_os in
4218 cygwin* | mingw* | pw32*) 4249 cygwin* | mingw* | pw32* | cegcc*)
4219 # FIXME: the MSVC++ port hasn't been tested in a loooong time 4250 # FIXME: the MSVC++ port hasn't been tested in a loooong time
4220 # When not using gcc, we currently assume that we are using 4251 # When not using gcc, we currently assume that we are using
4221 # Microsoft Visual C++. 4252 # Microsoft Visual C++.
@@ -4230,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4230 openbsd*) 4261 openbsd*)
4231 with_gnu_ld=no 4262 with_gnu_ld=no
4232 ;; 4263 ;;
4264 linux* | k*bsd*-gnu)
4265 _LT_TAGVAR(link_all_deplibs, $1)=no
4266 ;;
4233 esac 4267 esac
4234 4268
4235 _LT_TAGVAR(ld_shlibs, $1)=yes 4269 _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4302,7 +4336,7 @@ _LT_EOF
4302 fi 4336 fi
4303 ;; 4337 ;;
4304 4338
4305 cygwin* | mingw* | pw32*) 4339 cygwin* | mingw* | pw32* | cegcc*)
4306 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 4340 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
4307 # as there is no search path for DLLs. 4341 # as there is no search path for DLLs.
4308 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 4342 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -4368,6 +4402,9 @@ _LT_EOF
4368 tmp_addflag=' -i_dynamic -nofor_main' ;; 4402 tmp_addflag=' -i_dynamic -nofor_main' ;;
4369 ifc* | ifort*) # Intel Fortran compiler 4403 ifc* | ifort*) # Intel Fortran compiler
4370 tmp_addflag=' -nofor_main' ;; 4404 tmp_addflag=' -nofor_main' ;;
4405 lf95*) # Lahey Fortran 8.1
4406 _LT_TAGVAR(whole_archive_flag_spec, $1)=
4407 tmp_sharedflag='--shared' ;;
4371 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) 4408 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4372 tmp_sharedflag='-qmkshrobj' 4409 tmp_sharedflag='-qmkshrobj'
4373 tmp_addflag= ;; 4410 tmp_addflag= ;;
@@ -4600,6 +4637,7 @@ _LT_EOF
4600 fi 4637 fi
4601 fi 4638 fi
4602 4639
4640 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
4603 # It seems that -bexpall does not export symbols beginning with 4641 # It seems that -bexpall does not export symbols beginning with
4604 # underscore (_), so it is better to generate a list of symbols to export. 4642 # underscore (_), so it is better to generate a list of symbols to export.
4605 _LT_TAGVAR(always_export_symbols, $1)=yes 4643 _LT_TAGVAR(always_export_symbols, $1)=yes
@@ -4654,7 +4692,7 @@ _LT_EOF
4654 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic 4692 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
4655 ;; 4693 ;;
4656 4694
4657 cygwin* | mingw* | pw32*) 4695 cygwin* | mingw* | pw32* | cegcc*)
4658 # When not using gcc, we currently assume that we are using 4696 # When not using gcc, we currently assume that we are using
4659 # Microsoft Visual C++. 4697 # Microsoft Visual C++.
4660 # hardcode_libdir_flag_spec is actually meaningless, as there is 4698 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -4758,7 +4796,7 @@ _LT_EOF
4758 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4796 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4759 ;; 4797 ;;
4760 ia64*) 4798 ia64*)
4761 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 4799 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4762 ;; 4800 ;;
4763 *) 4801 *)
4764 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4802 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -5543,6 +5581,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5543 fi 5581 fi
5544 fi 5582 fi
5545 5583
5584 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
5546 # It seems that -bexpall does not export symbols beginning with 5585 # It seems that -bexpall does not export symbols beginning with
5547 # underscore (_), so it is better to generate a list of symbols to 5586 # underscore (_), so it is better to generate a list of symbols to
5548 # export. 5587 # export.
@@ -5601,7 +5640,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5601 esac 5640 esac
5602 ;; 5641 ;;
5603 5642
5604 cygwin* | mingw* | pw32*) 5643 cygwin* | mingw* | pw32* | cegcc*)
5605 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 5644 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
5606 # as there is no search path for DLLs. 5645 # as there is no search path for DLLs.
5607 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 5646 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -6986,6 +7025,18 @@ AC_SUBST([GREP])
6986]) 7025])
6987 7026
6988 7027
7028# _LT_DECL_OBJDUMP
7029# --------------
7030# If we don't have a new enough Autoconf to choose the best objdump
7031# available, choose the one first in the user's PATH.
7032m4_defun([_LT_DECL_OBJDUMP],
7033[AC_CHECK_TOOL(OBJDUMP, objdump, false)
7034test -z "$OBJDUMP" && OBJDUMP=objdump
7035_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
7036AC_SUBST([OBJDUMP])
7037])
7038
7039
6989# _LT_DECL_SED 7040# _LT_DECL_SED
6990# ------------ 7041# ------------
6991# Check for a fully-functional sed program, that truncates 7042# Check for a fully-functional sed program, that truncates
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4
index eb8db0cd1..46535e2e1 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 15 LTDL_INIT 10# serial 17 LTDL_INIT
11 11
12# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) 12# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
13# ------------------------------------------ 13# ------------------------------------------
@@ -212,26 +212,10 @@ 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
216 _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" 215 _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
217])# _LT_LIBOBJS 216])# _LT_LIBOBJS
218 217
219 218
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
235# LTDL_INIT([OPTIONS]) 219# LTDL_INIT([OPTIONS])
236# -------------------- 220# --------------------
237# Clients of libltdl can use this macro to allow the installer to 221# Clients of libltdl can use this macro to allow the installer to
@@ -245,9 +229,9 @@ _LT_SET_OPTIONS([$0], [$1])
245 229
246dnl We need to keep our own list of libobjs separate from our parent project, 230dnl We need to keep our own list of libobjs separate from our parent project,
247dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while 231dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
248dnl we look for our own LIBOBJs. Definitions in ltdl-libobj.m4. 232dnl we look for our own LIBOBJs.
249m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) 233m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
250m4_pushdef([AC_LIBSOURCES], m4_defn([_LT_LIBSOURCES])) 234m4_pushdef([AC_LIBSOURCES])
251 235
252dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: 236dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
253m4_if(_LTDL_MODE, [], 237m4_if(_LTDL_MODE, [],
@@ -264,7 +248,7 @@ if test "x$with_included_ltdl" != xyes; then
264 # decide whether there is a useful installed version we can use. 248 # decide whether there is a useful installed version we can use.
265 AC_CHECK_HEADER([ltdl.h], 249 AC_CHECK_HEADER([ltdl.h],
266 [AC_CHECK_DECL([lt_dlinterface_register], 250 [AC_CHECK_DECL([lt_dlinterface_register],
267 [AC_CHECK_LIB([ltdl], [lt_dlinterface_register], 251 [AC_CHECK_LIB([ltdl], [lt_dladvise_preload],
268 [with_included_ltdl=no], 252 [with_included_ltdl=no],
269 [with_included_ltdl=yes])], 253 [with_included_ltdl=yes])],
270 [with_included_ltdl=yes], 254 [with_included_ltdl=yes],
@@ -396,12 +380,6 @@ m4_require([_LT_HEADER_DLFCN])dnl
396m4_require([_LT_CHECK_DLPREOPEN])dnl 380m4_require([_LT_CHECK_DLPREOPEN])dnl
397m4_require([_LT_DECL_SED])dnl 381m4_require([_LT_DECL_SED])dnl
398 382
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
405dnl Don't require this, or it will be expanded earlier than the code 383dnl Don't require this, or it will be expanded earlier than the code
406dnl that sets the variables it relies on: 384dnl that sets the variables it relies on:
407_LT_ENABLE_INSTALL 385_LT_ENABLE_INSTALL
@@ -429,6 +407,8 @@ AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
429AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) 407AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
430AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) 408AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
431 409
410AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
411
432name=ltdl 412name=ltdl
433LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` 413LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
434AC_SUBST([LTDLOPEN]) 414AC_SUBST([LTDLOPEN])
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index e97011948..34151a3ba 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*) 128*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
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 0d258e070..9000a057d 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 Free Software Foundation, Inc. 3# Copyright (C) 2004, 2005, 2007, 2008 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 5 ltsugar.m4 10# serial 6 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.
66m4_define([lt_combine], 67m4_define([lt_combine],
67[m4_if([$2], [], [], 68[m4_if(m4_eval([$# > 3]), [1],
68 [m4_if([$4], [], [], 69 [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
69 [lt_join(m4_quote(m4_default([$1], [[, ]])), 70[[m4_foreach([_Lt_prefix], [$2],
70 lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], 71 [m4_foreach([_Lt_suffix],
71 [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), 72 ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
72 [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl 73 [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
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 45cb1557c..b8e154fe6 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 2976 ltversion.m4 12# serial 3012 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.4]) 15m4_define([LT_PACKAGE_VERSION], [2.2.6])
16m4_define([LT_PACKAGE_REVISION], [1.2976]) 16m4_define([LT_PACKAGE_REVISION], [1.3012])
17 17
18AC_DEFUN([LTVERSION_VERSION], 18AC_DEFUN([LTVERSION_VERSION],
19[macro_version='2.2.4' 19[macro_version='2.2.6'
20macro_revision='1.2976' 20macro_revision='1.3012'
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])