mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-24 14:24:59 +08:00
* 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.
This commit is contained in:
parent
2be972d59a
commit
cbd4699dab
@ -1,5 +1,14 @@
|
|||||||
1999-06-08 Gary V. Vaughan <gary@oranda.demon.co.uk>
|
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, pic_flag): Force separate compilation of
|
* ltconfig.in (cygwin, pic_flag): Force separate compilation of
|
||||||
objects for dlls vs. objects for static archives. Using a cpp
|
objects for dlls vs. objects for static archives. Using a cpp
|
||||||
macro also allows us to decide whether or not we need to use
|
macro also allows us to decide whether or not we need to use
|
||||||
|
37
ltconfig.in
37
ltconfig.in
@ -181,7 +181,8 @@ help="Try \`$progname --help' for more information."
|
|||||||
default_ofile=libtool
|
default_ofile=libtool
|
||||||
can_build_shared=yes
|
can_build_shared=yes
|
||||||
enable_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_static=yes
|
||||||
enable_fast_install=yes
|
enable_fast_install=yes
|
||||||
enable_dlopen=unknown
|
enable_dlopen=unknown
|
||||||
@ -201,6 +202,7 @@ need_locks=yes
|
|||||||
ac_ext=c
|
ac_ext=c
|
||||||
objext=o
|
objext=o
|
||||||
libext=a
|
libext=a
|
||||||
|
exeext=
|
||||||
cache_file=
|
cache_file=
|
||||||
|
|
||||||
old_AR="$AR"
|
old_AR="$AR"
|
||||||
@ -617,6 +619,36 @@ fi
|
|||||||
$rm conftest*
|
$rm conftest*
|
||||||
echo "$ac_t$objext" 1>&6
|
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
|
echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
|
||||||
pic_flag=
|
pic_flag=
|
||||||
special_shlib_compile_flags=
|
special_shlib_compile_flags=
|
||||||
@ -2748,6 +2780,9 @@ objext="$objext"
|
|||||||
# Old archive suffix (normally "a").
|
# Old archive suffix (normally "a").
|
||||||
libext="$libext"
|
libext="$libext"
|
||||||
|
|
||||||
|
# Executable file suffix (normally "").
|
||||||
|
exeext="$exeext"
|
||||||
|
|
||||||
# Additional compiler flags for building library objects.
|
# Additional compiler flags for building library objects.
|
||||||
pic_flag=$pic_flag
|
pic_flag=$pic_flag
|
||||||
|
|
||||||
|
@ -3412,7 +3412,7 @@ else
|
|||||||
|
|
||||||
if test "$fast_install" = yes; then
|
if test "$fast_install" = yes; then
|
||||||
echo >> $output "\
|
echo >> $output "\
|
||||||
program=lt-'$outputname'
|
program=lt-'$outputname$exeext'
|
||||||
progdir=\"\$thisdir/$objdir\"
|
progdir=\"\$thisdir/$objdir\"
|
||||||
|
|
||||||
if test ! -f \"\$progdir/\$program\" || \\
|
if test ! -f \"\$progdir/\$program\" || \\
|
||||||
@ -3445,7 +3445,7 @@ else
|
|||||||
fi"
|
fi"
|
||||||
else
|
else
|
||||||
echo >> $output "\
|
echo >> $output "\
|
||||||
program='$outputname'
|
program='$outputname$exeext'
|
||||||
progdir=\"\$thisdir/$objdir\"
|
progdir=\"\$thisdir/$objdir\"
|
||||||
"
|
"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user