suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: use installed `libtool' by default

Browse Source 
But libtool is used only for `--enabled-shared' builds.
This commit is contained in:
Matthew Flatt 2012-05-31 07:47:29 -06:00
parent a7206b1a9f
commit e9cec00da6
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/configure vendored
View File

@ -1340,7 +1340,7 @@ Optional Features:
--enable-usersetup setup user-specific files on install --enable-usersetup setup user-specific files on install
--enable-shared create shared libraries --enable-shared create shared libraries
--enable-dynlib same as --enable-shared --enable-dynlib same as --enable-shared
--enable-lt=<prog> use <prog> instead of bundled libtool --enable-lt=<prog> use <prog> instead of libtool; disable to use bundled
--enable-libffi use installed libffi (enabled by default) --enable-libffi use installed libffi (enabled by default)
--enable-sdk=<path> use Mac OS X 10.4 SDK directory --enable-sdk=<path> use Mac OS X 10.4 SDK directory
--enable-xonx use Unix style (e.g., use Gtk) for Mac OS X --enable-xonx use Unix style (e.g., use Gtk) for Mac OS X
@ -2035,7 +2035,7 @@ fi
if test "${enable_lt+set}" = set; then if test "${enable_lt+set}" = set; then
enableval=$enable_lt; LIBTOOLPROG="$enableval" enableval=$enable_lt; LIBTOOLPROG="$enableval"
else else
enable_lt=no enable_lt=default
fi fi
@ -2156,12 +2156,20 @@ fi
if test "${enable_shared}" != "yes" ; then if test "${enable_shared}" != "yes" ; then
enable_lt=no enable_lt=no
fi fi
if test "${enable_lt}" = "no" ; then
LIBTOOLPROG=""
fi
if test "${enable_lt}" = "yes" ; then if test "${enable_lt}" = "yes" ; then
echo "ERROR: no program given for libtool!" echo "ERROR: no program given for libtool!"
echo " Supply a program for --enable-lt, something like this:" echo " Supply a program for --enable-lt, something like this:"
echo " --enable-lt=/usr/bin/libtool" echo " --enable-lt=/usr/bin/libtool"
exit 1 exit 1
fi fi
if test "${enable_lt}" = "default" ; then
if `which libtool > /dev/null` ; then
LIBTOOLPROG="libtool"
fi
fi
if test "${enable_shared}" = "yes" ; then if test "${enable_shared}" = "yes" ; then
case "$host_os" in case "$host_os" in

10
src/racket/configure.ac
View File

@ -42,7 +42,7 @@ AC_ARG_ENABLE(docs, [ --enable-docs build docs on install (enabled
AC_ARG_ENABLE(usersetup, [ --enable-usersetup setup user-specific files on install]) AC_ARG_ENABLE(usersetup, [ --enable-usersetup setup user-specific files on install])
AC_ARG_ENABLE(shared, [ --enable-shared create shared libraries]) AC_ARG_ENABLE(shared, [ --enable-shared create shared libraries])
AC_ARG_ENABLE(dynlib, [ --enable-dynlib same as --enable-shared]) AC_ARG_ENABLE(dynlib, [ --enable-dynlib same as --enable-shared])
AC_ARG_ENABLE(lt, [ --enable-lt=<prog> use <prog> instead of bundled libtool], LIBTOOLPROG="$enableval", enable_lt=no) AC_ARG_ENABLE(lt, [ --enable-lt=<prog> use <prog> instead of libtool; disable to use bundled], LIBTOOLPROG="$enableval", enable_lt=default)
AC_ARG_ENABLE(libffi, [ --enable-libffi use installed libffi (enabled by default)], , enable_libffi=yes) AC_ARG_ENABLE(libffi, [ --enable-libffi use installed libffi (enabled by default)], , enable_libffi=yes)
@ -89,12 +89,20 @@ fi
if test "${enable_shared}" != "yes" ; then if test "${enable_shared}" != "yes" ; then
enable_lt=no enable_lt=no
fi fi
if test "${enable_lt}" = "no" ; then
LIBTOOLPROG=""
fi
if test "${enable_lt}" = "yes" ; then if test "${enable_lt}" = "yes" ; then
echo "ERROR: no program given for libtool!" echo "ERROR: no program given for libtool!"
echo " Supply a program for --enable-lt, something like this:" echo " Supply a program for --enable-lt, something like this:"
echo " --enable-lt=/usr/bin/libtool" echo " --enable-lt=/usr/bin/libtool"
exit 1 exit 1
fi fi
if test "${enable_lt}" = "default" ; then
if `which libtool > /dev/null` ; then
LIBTOOLPROG="libtool"
fi
fi
if test "${enable_shared}" = "yes" ; then if test "${enable_shared}" = "yes" ; then
case "$host_os" in case "$host_os" in