diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-06-10 05:57:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-06-10 05:57:55 +0000 |
commit | d5e4648c1a755af9d9b47d446e750d228ce66f99 (patch) | |
tree | 562a0b5f17ede06d961b113e951eef16d790c2bd /m4 | |
parent | 18bd5e0a920729f0baf414311130e0a92e775bbb (diff) | |
download | gnunet-d5e4648c1a755af9d9b47d446e750d228ce66f99.tar.gz gnunet-d5e4648c1a755af9d9b47d446e750d228ce66f99.zip |
timeout code
Diffstat (limited to 'm4')
-rw-r--r-- | m4/argz.m4 | 4 | ||||
-rw-r--r-- | m4/libtool.m4 | 131 | ||||
-rw-r--r-- | m4/ltdl.m4 | 32 | ||||
-rw-r--r-- | m4/ltoptions.m4 | 2 | ||||
-rw-r--r-- | m4/ltsugar.m4 | 20 | ||||
-rw-r--r-- | m4/ltversion.m4 | 10 |
6 files changed, 84 insertions, 115 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= | |||
28 | AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \ | 28 | AC_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 | ||
31 | dnl if have system argz functions, allow forced use of | 31 | dnl if have system argz functions, allow forced use of |
32 | dnl libltdl-supplied implementation (and default to do so | 32 | dnl libltdl-supplied implementation (and default to do so |
33 | dnl on "known bad" systems). Could use a runtime check, but | 33 | dnl on "known bad" systems). Could use a runtime check, but |
34 | dnl (a) detecting malloc issues is notoriously unreliable | 34 | dnl (a) detecting malloc issues is notoriously unreliable |
35 | dnl (b) only known system that declares argz functions, | 35 | dnl (b) only known system that declares argz functions, |
36 | dnl provides them, yet they are broken, is cygwin | 36 | dnl provides them, yet they are broken, is cygwin |
37 | dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) | 37 | dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) |
38 | dnl So, it's more straightforward simply to special case | 38 | dnl So, it's more straightforward simply to special case |
39 | dnl this for known bad systems. | 39 | dnl this for known bad systems. |
40 | AS_IF([test -z "$ARGZ_H"], | 40 | AS_IF([test -z "$ARGZ_H"], |
41 | [AC_CACHE_CHECK( | 41 | [AC_CACHE_CHECK( |
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 1e7ea47c0..6e86e5b43 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 | # --------------------------------------------------- |
382 | m4_define([lt_decl_varnames_tagged], | 382 | m4_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($@)))), |
387 | m4_define([_lt_decl_varnames_tagged], | 387 | m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) |
388 | [m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) | 388 | m4_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 | ||
1684 | extern "C" void exit (int); | ||
1685 | #endif | ||
1686 | |||
1687 | void fnord() { int i=42;} | 1687 | void fnord() { int i=42;} |
1688 | int main () | 1688 | int 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 |
2036 | m4_require([_LT_DECL_EGREP])dnl | 2036 | m4_require([_LT_DECL_EGREP])dnl |
2037 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl | 2037 | m4_require([_LT_FILEUTILS_DEFAULTS])dnl |
2038 | m4_require([_LT_DECL_OBJDUMP])dnl | ||
2039 | m4_require([_LT_DECL_SED])dnl | 2038 | m4_require([_LT_DECL_SED])dnl |
2040 | AC_MSG_CHECKING([dynamic linker characteristics]) | 2039 | AC_MSG_CHECKING([dynamic linker characteristics]) |
2041 | m4_if([$1], | 2040 | m4_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 | ||
2203 | cygwin* | mingw* | pw32* | cegcc*) | 2202 | cygwin* | 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"` |
@@ -2668,7 +2667,7 @@ tpf*) | |||
2668 | version_type=linux | 2667 | version_type=linux |
2669 | need_lib_prefix=no | 2668 | need_lib_prefix=no |
2670 | need_version=no | 2669 | need_version=no |
2671 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' | 2670 | library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2672 | shlibpath_var=LD_LIBRARY_PATH | 2671 | shlibpath_var=LD_LIBRARY_PATH |
2673 | shlibpath_overrides_runpath=no | 2672 | shlibpath_overrides_runpath=no |
2674 | hardcode_into_libs=yes | 2673 | hardcode_into_libs=yes |
@@ -2692,7 +2691,7 @@ variables_saved_for_relink="PATH $shlibpath_var $runpath_var" | |||
2692 | if test "$GCC" = yes; then | 2691 | if test "$GCC" = yes; then |
2693 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" | 2692 | variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" |
2694 | fi | 2693 | fi |
2695 | 2694 | ||
2696 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then | 2695 | if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then |
2697 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" | 2696 | sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" |
2698 | fi | 2697 | fi |
@@ -2969,7 +2968,6 @@ _LT_DECL([], [reload_cmds], [2])dnl | |||
2969 | # -- PORTME fill in with the dynamic library characteristics | 2968 | # -- PORTME fill in with the dynamic library characteristics |
2970 | m4_defun([_LT_CHECK_MAGIC_METHOD], | 2969 | m4_defun([_LT_CHECK_MAGIC_METHOD], |
2971 | [m4_require([_LT_DECL_EGREP]) | 2970 | [m4_require([_LT_DECL_EGREP]) |
2972 | m4_require([_LT_DECL_OBJDUMP]) | ||
2973 | AC_CACHE_CHECK([how to recognize dependent libraries], | 2971 | AC_CACHE_CHECK([how to recognize dependent libraries], |
2974 | lt_cv_deplibs_check_method, | 2972 | lt_cv_deplibs_check_method, |
2975 | [lt_cv_file_magic_cmd='$MAGIC_CMD' | 2973 | [lt_cv_file_magic_cmd='$MAGIC_CMD' |
@@ -3020,12 +3018,6 @@ mingw* | pw32*) | |||
3020 | fi | 3018 | fi |
3021 | ;; | 3019 | ;; |
3022 | 3020 | ||
3023 | cegcc) | ||
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 | |||
3029 | darwin* | rhapsody*) | 3021 | darwin* | rhapsody*) |
3030 | lt_cv_deplibs_check_method=pass_all | 3022 | lt_cv_deplibs_check_method=pass_all |
3031 | ;; | 3023 | ;; |
@@ -3337,7 +3329,7 @@ case $host_os in | |||
3337 | aix*) | 3329 | aix*) |
3338 | symcode='[[BCDT]]' | 3330 | symcode='[[BCDT]]' |
3339 | ;; | 3331 | ;; |
3340 | cygwin* | mingw* | pw32* | cegcc*) | 3332 | cygwin* | mingw* | pw32*) |
3341 | symcode='[[ABCDGISTW]]' | 3333 | symcode='[[ABCDGISTW]]' |
3342 | ;; | 3334 | ;; |
3343 | hpux*) | 3335 | hpux*) |
@@ -3583,7 +3575,7 @@ m4_if([$1], [CXX], [ | |||
3583 | beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) | 3575 | beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) |
3584 | # PIC is the default for these OSes. | 3576 | # PIC is the default for these OSes. |
3585 | ;; | 3577 | ;; |
3586 | mingw* | cygwin* | os2* | pw32* | cegcc*) | 3578 | mingw* | cygwin* | os2* | pw32*) |
3587 | # This hack is so that the source file can tell whether it is being | 3579 | # This hack is so that the source file can tell whether it is being |
3588 | # built for inclusion in a dll (and should export symbols for example). | 3580 | # built for inclusion in a dll (and should export symbols for example). |
3589 | # Although the cygwin gcc ignores -fPIC, still need this for old-style | 3581 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
@@ -3610,11 +3602,10 @@ m4_if([$1], [CXX], [ | |||
3610 | fi | 3602 | fi |
3611 | ;; | 3603 | ;; |
3612 | hpux*) | 3604 | hpux*) |
3613 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit | 3605 | # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
3614 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag | 3606 | # not for PA HP-UX. |
3615 | # sets the default TLS model and affects inlining. | ||
3616 | case $host_cpu in | 3607 | case $host_cpu in |
3617 | hppa*64*) | 3608 | hppa*64*|ia64*) |
3618 | ;; | 3609 | ;; |
3619 | *) | 3610 | *) |
3620 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 3611 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
@@ -3712,19 +3703,12 @@ m4_if([$1], [CXX], [ | |||
3712 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' | 3703 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' |
3713 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | 3704 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
3714 | ;; | 3705 | ;; |
3715 | ecpc* ) | 3706 | icpc* | ecpc* ) |
3716 | # old Intel C++ for x86_64 which still supported -KPIC. | 3707 | # Intel C++ |
3717 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 3708 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3718 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 3709 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3719 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | 3710 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3720 | ;; | 3711 | ;; |
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 | ;; | ||
3728 | pgCC* | pgcpp*) | 3712 | pgCC* | pgcpp*) |
3729 | # Portland Group C++ compiler | 3713 | # Portland Group C++ compiler |
3730 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 3714 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
@@ -3890,7 +3874,7 @@ m4_if([$1], [CXX], [ | |||
3890 | # PIC is the default for these OSes. | 3874 | # PIC is the default for these OSes. |
3891 | ;; | 3875 | ;; |
3892 | 3876 | ||
3893 | mingw* | cygwin* | pw32* | os2* | cegcc*) | 3877 | mingw* | cygwin* | pw32* | os2*) |
3894 | # This hack is so that the source file can tell whether it is being | 3878 | # This hack is so that the source file can tell whether it is being |
3895 | # built for inclusion in a dll (and should export symbols for example). | 3879 | # built for inclusion in a dll (and should export symbols for example). |
3896 | # Although the cygwin gcc ignores -fPIC, still need this for old-style | 3880 | # Although the cygwin gcc ignores -fPIC, still need this for old-style |
@@ -3906,11 +3890,10 @@ m4_if([$1], [CXX], [ | |||
3906 | ;; | 3890 | ;; |
3907 | 3891 | ||
3908 | hpux*) | 3892 | hpux*) |
3909 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit | 3893 | # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but |
3910 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag | 3894 | # not for PA HP-UX. |
3911 | # sets the default TLS model and affects inlining. | ||
3912 | case $host_cpu in | 3895 | case $host_cpu in |
3913 | hppa*64*) | 3896 | hppa*64*|ia64*) |
3914 | # +Z the default | 3897 | # +Z the default |
3915 | ;; | 3898 | ;; |
3916 | *) | 3899 | *) |
@@ -3960,7 +3943,7 @@ m4_if([$1], [CXX], [ | |||
3960 | fi | 3943 | fi |
3961 | ;; | 3944 | ;; |
3962 | 3945 | ||
3963 | mingw* | cygwin* | pw32* | os2* | cegcc*) | 3946 | mingw* | cygwin* | pw32* | os2*) |
3964 | # This hack is so that the source file can tell whether it is being | 3947 | # This hack is so that the source file can tell whether it is being |
3965 | # built for inclusion in a dll (and should export symbols for example). | 3948 | # built for inclusion in a dll (and should export symbols for example). |
3966 | m4_if([$1], [GCJ], [], | 3949 | m4_if([$1], [GCJ], [], |
@@ -3991,25 +3974,11 @@ m4_if([$1], [CXX], [ | |||
3991 | 3974 | ||
3992 | linux* | k*bsd*-gnu) | 3975 | linux* | k*bsd*-gnu) |
3993 | case $cc_basename in | 3976 | case $cc_basename in |
3994 | # old Intel for x86_64 which still supported -KPIC. | 3977 | icc* | ecc* | ifort*) |
3995 | ecc*) | ||
3996 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | 3978 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
3997 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 3979 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
3998 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | 3980 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
3999 | ;; | 3981 | ;; |
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 | ;; | ||
4013 | pgcc* | pgf77* | pgf90* | pgf95*) | 3982 | pgcc* | pgf77* | pgf90* | pgf95*) |
4014 | # Portland Group compilers (*not* the Pentium gcc compiler, | 3983 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4015 | # which looks to be a dead project) | 3984 | # which looks to be a dead project) |
@@ -4191,7 +4160,7 @@ m4_if([$1], [CXX], [ | |||
4191 | pw32*) | 4160 | pw32*) |
4192 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" | 4161 | _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" |
4193 | ;; | 4162 | ;; |
4194 | cygwin* | mingw* | cegcc*) | 4163 | cygwin* | mingw*) |
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' | 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' |
4196 | ;; | 4165 | ;; |
4197 | linux* | k*bsd*-gnu) | 4166 | linux* | k*bsd*-gnu) |
@@ -4246,7 +4215,7 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4246 | extract_expsyms_cmds= | 4215 | extract_expsyms_cmds= |
4247 | 4216 | ||
4248 | case $host_os in | 4217 | case $host_os in |
4249 | cygwin* | mingw* | pw32* | cegcc*) | 4218 | cygwin* | mingw* | pw32*) |
4250 | # FIXME: the MSVC++ port hasn't been tested in a loooong time | 4219 | # FIXME: the MSVC++ port hasn't been tested in a loooong time |
4251 | # When not using gcc, we currently assume that we are using | 4220 | # When not using gcc, we currently assume that we are using |
4252 | # Microsoft Visual C++. | 4221 | # Microsoft Visual C++. |
@@ -4261,9 +4230,6 @@ dnl Note also adjust exclude_expsyms for C++ above. | |||
4261 | openbsd*) | 4230 | openbsd*) |
4262 | with_gnu_ld=no | 4231 | with_gnu_ld=no |
4263 | ;; | 4232 | ;; |
4264 | linux* | k*bsd*-gnu) | ||
4265 | _LT_TAGVAR(link_all_deplibs, $1)=no | ||
4266 | ;; | ||
4267 | esac | 4233 | esac |
4268 | 4234 | ||
4269 | _LT_TAGVAR(ld_shlibs, $1)=yes | 4235 | _LT_TAGVAR(ld_shlibs, $1)=yes |
@@ -4336,7 +4302,7 @@ _LT_EOF | |||
4336 | fi | 4302 | fi |
4337 | ;; | 4303 | ;; |
4338 | 4304 | ||
4339 | cygwin* | mingw* | pw32* | cegcc*) | 4305 | cygwin* | mingw* | pw32*) |
4340 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 4306 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
4341 | # as there is no search path for DLLs. | 4307 | # as there is no search path for DLLs. |
4342 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 4308 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
@@ -4402,9 +4368,6 @@ _LT_EOF | |||
4402 | tmp_addflag=' -i_dynamic -nofor_main' ;; | 4368 | tmp_addflag=' -i_dynamic -nofor_main' ;; |
4403 | ifc* | ifort*) # Intel Fortran compiler | 4369 | ifc* | ifort*) # Intel Fortran compiler |
4404 | tmp_addflag=' -nofor_main' ;; | 4370 | tmp_addflag=' -nofor_main' ;; |
4405 | lf95*) # Lahey Fortran 8.1 | ||
4406 | _LT_TAGVAR(whole_archive_flag_spec, $1)= | ||
4407 | tmp_sharedflag='--shared' ;; | ||
4408 | xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) | 4371 | xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4409 | tmp_sharedflag='-qmkshrobj' | 4372 | tmp_sharedflag='-qmkshrobj' |
4410 | tmp_addflag= ;; | 4373 | tmp_addflag= ;; |
@@ -4637,7 +4600,6 @@ _LT_EOF | |||
4637 | fi | 4600 | fi |
4638 | fi | 4601 | fi |
4639 | 4602 | ||
4640 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' | ||
4641 | # It seems that -bexpall does not export symbols beginning with | 4603 | # It seems that -bexpall does not export symbols beginning with |
4642 | # underscore (_), so it is better to generate a list of symbols to export. | 4604 | # underscore (_), so it is better to generate a list of symbols to export. |
4643 | _LT_TAGVAR(always_export_symbols, $1)=yes | 4605 | _LT_TAGVAR(always_export_symbols, $1)=yes |
@@ -4692,7 +4654,7 @@ _LT_EOF | |||
4692 | _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic | 4654 | _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic |
4693 | ;; | 4655 | ;; |
4694 | 4656 | ||
4695 | cygwin* | mingw* | pw32* | cegcc*) | 4657 | cygwin* | mingw* | pw32*) |
4696 | # When not using gcc, we currently assume that we are using | 4658 | # When not using gcc, we currently assume that we are using |
4697 | # Microsoft Visual C++. | 4659 | # Microsoft Visual C++. |
4698 | # hardcode_libdir_flag_spec is actually meaningless, as there is | 4660 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
@@ -4796,7 +4758,7 @@ _LT_EOF | |||
4796 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' | 4758 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' |
4797 | ;; | 4759 | ;; |
4798 | ia64*) | 4760 | ia64*) |
4799 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' | 4761 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' |
4800 | ;; | 4762 | ;; |
4801 | *) | 4763 | *) |
4802 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' | 4764 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
@@ -5581,7 +5543,6 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
5581 | fi | 5543 | fi |
5582 | fi | 5544 | fi |
5583 | 5545 | ||
5584 | _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' | ||
5585 | # It seems that -bexpall does not export symbols beginning with | 5546 | # It seems that -bexpall does not export symbols beginning with |
5586 | # underscore (_), so it is better to generate a list of symbols to | 5547 | # underscore (_), so it is better to generate a list of symbols to |
5587 | # export. | 5548 | # export. |
@@ -5640,7 +5601,7 @@ if test "$_lt_caught_CXX_error" != yes; then | |||
5640 | esac | 5601 | esac |
5641 | ;; | 5602 | ;; |
5642 | 5603 | ||
5643 | cygwin* | mingw* | pw32* | cegcc*) | 5604 | cygwin* | mingw* | pw32*) |
5644 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, | 5605 | # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, |
5645 | # as there is no search path for DLLs. | 5606 | # as there is no search path for DLLs. |
5646 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' | 5607 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' |
@@ -7025,18 +6986,6 @@ AC_SUBST([GREP]) | |||
7025 | ]) | 6986 | ]) |
7026 | 6987 | ||
7027 | 6988 | ||
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. | ||
7032 | m4_defun([_LT_DECL_OBJDUMP], | ||
7033 | [AC_CHECK_TOOL(OBJDUMP, objdump, false) | ||
7034 | test -z "$OBJDUMP" && OBJDUMP=objdump | ||
7035 | _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) | ||
7036 | AC_SUBST([OBJDUMP]) | ||
7037 | ]) | ||
7038 | |||
7039 | |||
7040 | # _LT_DECL_SED | 6989 | # _LT_DECL_SED |
7041 | # ------------ | 6990 | # ------------ |
7042 | # Check for a fully-functional sed program, that truncates | 6991 | # Check for a fully-functional sed program, that truncates |
diff --git a/m4/ltdl.m4 b/m4/ltdl.m4 index 46535e2e1..eb8db0cd1 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. |
213 | AC_DEFUN([_LT_LIBOBJ], [ | 213 | AC_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. | ||
224 | AC_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 | ||
230 | dnl We need to keep our own list of libobjs separate from our parent project, | 246 | dnl We need to keep our own list of libobjs separate from our parent project, |
231 | dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while | 247 | dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while |
232 | dnl we look for our own LIBOBJs. | 248 | dnl we look for our own LIBOBJs. Definitions in ltdl-libobj.m4. |
233 | m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) | 249 | m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) |
234 | m4_pushdef([AC_LIBSOURCES]) | 250 | m4_pushdef([AC_LIBSOURCES], m4_defn([_LT_LIBSOURCES])) |
235 | 251 | ||
236 | dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: | 252 | dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: |
237 | m4_if(_LTDL_MODE, [], | 253 | m4_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 | |||
380 | m4_require([_LT_CHECK_DLPREOPEN])dnl | 396 | m4_require([_LT_CHECK_DLPREOPEN])dnl |
381 | m4_require([_LT_DECL_SED])dnl | 397 | m4_require([_LT_DECL_SED])dnl |
382 | 398 | ||
399 | # lt_cv_dlopen_self gets defined by LT_SYS_DLOPEN_SELF, called by LT_INIT | ||
400 | if 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.]) | ||
403 | fi | ||
404 | |||
383 | dnl Don't require this, or it will be expanded earlier than the code | 405 | dnl Don't require this, or it will be expanded earlier than the code |
384 | dnl that sets the variables it relies on: | 406 | dnl 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], | |||
407 | AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) | 429 | AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) |
408 | AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) | 430 | AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) |
409 | 431 | ||
410 | AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) | ||
411 | |||
412 | name=ltdl | 432 | name=ltdl |
413 | LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` | 433 | LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` |
414 | AC_SUBST([LTDLOPEN]) | 434 | AC_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 | ||
127 | case $host in | 127 | case $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. |
13 | AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) | 13 | AC_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. | ||
67 | m4_define([lt_combine], | 66 | m4_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 | ||
15 | m4_define([LT_PACKAGE_VERSION], [2.2.6]) | 15 | m4_define([LT_PACKAGE_VERSION], [2.2.4]) |
16 | m4_define([LT_PACKAGE_REVISION], [1.3012]) | 16 | m4_define([LT_PACKAGE_REVISION], [1.2976]) |
17 | 17 | ||
18 | AC_DEFUN([LTVERSION_VERSION], | 18 | AC_DEFUN([LTVERSION_VERSION], |
19 | [macro_version='2.2.6' | 19 | [macro_version='2.2.4' |
20 | macro_revision='1.3012' | 20 | macro_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 | ]) |