From: Alexandre Oliva Date: Fri, 3 Dec 1999 11:03:01 +0000 (+0000) Subject: * ltconfig.in (ac_compile): Use $ac_ext instead of .c. X-Git-Tag: release-1-3-4~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87cf552d8e5471153b9aaae154b093f986b35161;p=thirdparty%2Flibtool.git * ltconfig.in (ac_compile): Use $ac_ext instead of .c. (ac_link): Likewise. (dlfcn.h, ac_try): Do not add filename, it is already in ac_compile. Reported by Stephane Conversy * ltconfig.in (linux-gnu*): Disable hardcode_into_libs until it works together with fast_install. * libtool.m4: Use host when --target is not specified. * configure.in: AC_SUBST variables that are used by ltconfig to build libtool. * ltconfig.in (irix6*): Do not override deplibs_check_method here. * libtool.m4: Do not AC_SUBST anything other than LIBTOOL. --- diff --git a/ChangeLog b/ChangeLog index 906119504..b158d1ffb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +1999-12-03 Alexandre Oliva + + * ltconfig.in (ac_compile): Use $ac_ext instead of .c. + (ac_link): Likewise. + (dlfcn.h, ac_try): Do not add filename, it is already in + ac_compile. + Reported by Stephane Conversy + + * ltconfig.in (linux-gnu*): Disable hardcode_into_libs until it + works together with fast_install. + + * libtool.m4: Use host when --target is not specified. + + * configure.in: AC_SUBST variables that are used by ltconfig to + build libtool. + + * ltconfig.in (irix6*): Do not override deplibs_check_method + here. + + * libtool.m4: Do not AC_SUBST anything other than LIBTOOL. + 1999-11-29 Gary V. Vaughan * ltconfig.in: Be friendlier to C++ compilers when testing diff --git a/configure.in b/configure.in index 51086408e..273aa9b90 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,9 @@ dnl Use the specified CC, RANLIB, and LD while running ltconfig. AC_PROG_CC AC_PROG_RANLIB AM_PROG_LD +AC_SUBST(LD) AM_PROG_NM +AC_SUBST(NM) AC_PROG_LN_S dnl For the `lineno' script (which puts line numbers into `ltconfig'). @@ -43,6 +45,7 @@ dnl Check for dlopen support AC_LIBTOOL_DLOPEN AC_LIBTOOL_SETUP AC_SUBST(DLLTOOL) +AC_SUBST(FILE) AC_SUBST(OBJDUMP) AC_SUBST(AS) diff --git a/libtool.m4 b/libtool.m4 index 5934e550c..47abe4306 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -34,7 +34,7 @@ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $target \ +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ || AC_MSG_ERROR([libtool configure failed]) # Reload cache, that may have been modified by ltconfig @@ -66,6 +66,11 @@ AC_REQUIRE([AC_PROG_NM])dnl AC_REQUIRE([AC_PROG_LN_S])dnl dnl +case "$target" in +NONE) lt_target="$host" ;; +*) lt_target="$target" ;; +esac + # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" @@ -84,7 +89,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" # Some flags need to be propagated to the compiler or linker for good # libtool support. -case "$target" in +case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. echo '[#]line __oline__ "configure"' > conftest.$ac_ext @@ -300,7 +305,6 @@ else AC_MSG_RESULT(no) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_SUBST(LD) AC_PROG_LD_GNU ]) @@ -346,14 +350,13 @@ else fi]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) -AC_SUBST(NM) ]) # AC_CHECK_LIBM - check for math library AC_DEFUN(AC_CHECK_LIBM, [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= -case "$target" in +case "$lt_target" in *-*-beos* | *-*-cygwin*) # These system don't have libm ;; diff --git a/ltconfig.in b/ltconfig.in index 302803f67..d7b10900c 100755 --- a/ltconfig.in +++ b/ltconfig.in @@ -171,8 +171,8 @@ PROGRAM=ltconfig PACKAGE=@PACKAGE@ VERSION=@VERSION@ TIMESTAMP="@TIMESTAMP@" -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' rm="rm -f" help="Try \`$progname --help' for more information." @@ -1928,8 +1928,6 @@ irix5* | irix6*) *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;; *) libsuff= shlibsuff= libmagic=never-match;; esac - # this will be overridden with pass_all, but let us keep it just in case - deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" ;; esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH @@ -1959,6 +1957,10 @@ linux-gnu*) deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' file_magic_cmd=/usr/bin/file file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + # hardcode_into_libs=yes if test -f /lib/ld.so.1; then dynamic_linker='GNU ld.so' @@ -2448,7 +2450,7 @@ else #include <$ac_hdr> int fnord = 0; EOF -ac_try="$ac_compile conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_compile >/dev/null 2>conftest.out" { (eval echo $progname:@LINENO@: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then