From: Gary V. Vaughan <gary@gnu.org>
Date: Tue, 8 Jun 1999 12:48:35 +0000 (+0000)
Subject: * ltmain.in (exeext): Use $exeext when working out the names of
X-Git-Tag: release-1-3-3~18
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=694f74a5aea2247234fc759ee65f50be944f877f;p=thirdparty%2Flibtool.git

* ltmain.in (exeext): Use $exeext when working out the names of
programs (but not the wrapper script itself due to a stupidity in
win32 which hardwires the .exe extension to the binary loader!).
* ltconfig.in (exeext): Now that the wrapper script tries to move
executables, we need to know whether they have an extension (ala
AC_EXEEXT).  Since we can't rely on AC_EXEEXT having been called
in configure.in, we must be able to check for ourselves, though we
can look for a cached result incase AC_EXEEXT was called.
---

diff --git a/ChangeLog b/ChangeLog
index 365a10372..37a1dfe55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 1999-06-08  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
+	* ltmain.in (exeext): Use $exeext when working out the names of
+	programs (but not the wrapper script itself due to a stupidity in
+	win32 which hardwires the .exe extension to the binary loader!).
+	* ltconfig.in (exeext): Now that the wrapper script tries to move
+	executables, we need to know whether they have an extension (ala
+	AC_EXEEXT).  Since we can't rely on AC_EXEEXT having been called
+	in configure.in, we must be able to check for ourselves, though we
+	can look for a cached result incase AC_EXEEXT was called.
+	
 	* ltconfig.in (cygwin, need_version): Set to no, otherwise module
 	dll's end up with mighty long names!
 	
diff --git a/ltconfig.in b/ltconfig.in
index 1a22df6db..7df23f398 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -181,7 +181,8 @@ help="Try \`$progname --help' for more information."
 default_ofile=libtool
 can_build_shared=yes
 enable_shared=yes
-# All known linkers require a `.a' archive for static linking.
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
 enable_static=yes
 enable_fast_install=yes
 enable_dlopen=unknown
@@ -201,6 +202,7 @@ need_locks=yes
 ac_ext=c
 objext=o
 libext=a
+exeext=
 cache_file=
 
 old_AR="$AR"
@@ -617,6 +619,36 @@ fi
 $rm conftest*
 echo "$ac_t$objext" 1>&6
 
+echo $ac_n "checking for executable suffix... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_exeext="none"
+  $rm conftest*
+  echo 'main () { return 0; }' > conftest.c
+  echo "$progname:@LINENO@: checking for executable suffix" >& 5
+  if { (eval echo $progname:@LINENO@: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
+    # Append any warnings to the config.log.
+    cat conftest.err 1>&5
+
+    for ac_file in conftest.*; do
+      case $ac_file in
+      *.c | *.$objext ) ;;
+      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
+      esac
+    done
+  else
+    cat conftest.err 1>&5
+    echo "$progname: failed program was:" >&5
+    cat conftest.c >&5
+  fi
+  $rm conftest*
+fi
+if test X$ac_cv_exeext != Xnone; then
+  exeext="$ac_cv_exeext"
+fi
+echo "$ac_t$ac_cv_exeext" 1>&6
+
 echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
 pic_flag=
 special_shlib_compile_flags=
@@ -2733,6 +2765,9 @@ objext="$objext"
 # Old archive suffix (normally "a").
 libext="$libext"
 
+# Executable file suffix (normally "").
+exeext="$exeext"
+
 # Additional compiler flags for building library objects.
 pic_flag=$pic_flag
 
diff --git a/ltmain.in b/ltmain.in
index 1f5a7e155..ca7e1f17d 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2816,7 +2816,7 @@ else
 
 	if test "$fast_install" = yes; then
 	  echo >> $output "\
-  program=lt-'$outputname'
+  program=lt-'$outputname$exeext'
   progdir=\"\$thisdir/$objdir\"
   
   if test ! -f \"\$progdir/\$program\" || \\
@@ -2849,7 +2849,7 @@ else
   fi"
 	else
 	  echo >> $output "\
-  program='$outputname'
+  program='$outputname$exeext'
   progdir=\"\$thisdir/$objdir\"
 "
 	fi