From: Gary V. Vaughan Date: Sat, 11 Nov 2000 13:42:59 +0000 (+0000) Subject: * ltdl.m4, ltcf-c.sh, libtool.m4: Use $ac_ext and $ac_objext X-Git-Tag: multi-language-merge-point~119 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f22d4bfb18f5869bc3ea57e751fba6dfaad87715;p=thirdparty%2Flibtool.git * ltdl.m4, ltcf-c.sh, libtool.m4: Use $ac_ext and $ac_objext respectively for conftest sources and objects. Reported by Carlo Wood --- diff --git a/ChangeLog b/ChangeLog index f255564ec..fd7128f72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2000-11-12 Gary V. Vaughan +2000-11-11 Gary V. Vaughan + + * ltdl.m4, ltcf-c.sh, libtool.m4: Use $ac_ext and $ac_objext + respectively for conftest sources and objects. + Reported by Carlo Wood * doc/fdl.texi: New file. The license for distributing the libtool manual. diff --git a/libtool.m4 b/libtool.m4 index ece3c54c1..dfcf75801 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -143,7 +143,7 @@ case "$host" in # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case "`/usr/bin/file conftest.$ac_objext`" in *32-bit*) LD="${LD-ld} -32" ;; diff --git a/ltcf-c.sh b/ltcf-c.sh index 5dda45bee..f766c5bc8 100644 --- a/ltcf-c.sh +++ b/ltcf-c.sh @@ -665,7 +665,7 @@ if test "$enable_shared" = yes && test "$with_gcc" = yes; then cat conftest.err 1>&5 soname=conftest lib=conftest - libobjs=conftest.o + libobjs=conftest.$ac_objext deplibs= wl=$ac_cv_prog_cc_wl compiler_flags=-v diff --git a/ltdl.m4 b/ltdl.m4 index a2bcb46ae..bc78d6071 100644 --- a/ltdl.m4 +++ b/ltdl.m4 @@ -270,16 +270,16 @@ EOF # Make sure that we snagged all the symbols we need. if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then - cat < conftest.c + cat < conftest.$ac_ext #ifdef __cplusplus extern "C" { #endif EOF # Now generate the symbol file. - eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c' + eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.$ac_ext' - cat <> conftest.c + cat <> conftest.$ac_ext #if defined (__STDC__) && __STDC__ # define lt_ptr_t void * #else @@ -297,8 +297,8 @@ lt_preloaded_symbols[] = changequote([,])dnl { EOF - sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c - cat <<\EOF >> conftest.c + sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.$ac_ext + cat <<\EOF >> conftest.$ac_ext {0, (lt_ptr_t) 0} }; @@ -316,7 +316,7 @@ EOF ac_pipe_works=yes else echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC + cat conftest.$ac_ext >&AC_FD_CC fi LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" @@ -331,7 +331,7 @@ EOF fi else echo "$progname: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC + cat conftest.$ac_ext >&AC_FD_CC fi rm -rf conftest* conftst* @@ -385,7 +385,7 @@ if AC_TRY_EVAL(ac_compile); then fi else echo "configure: failed program was:" >&AC_FD_CC - cat conftest.c >&AC_FD_CC + cat conftest.$ac_ext >&AC_FD_CC fi rm -rf conftest* ])