Commit 2b6c09cf by Maarten L. Hekkelman

shared libraries, default action again

parent 9ee47408
...@@ -1396,7 +1396,7 @@ Optional Features: ...@@ -1396,7 +1396,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-shared[=PKGS] build shared libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS] --enable-fast-install[=PKGS]
optimize for fast installation [default=yes] optimize for fast installation [default=yes]
...@@ -4467,6 +4467,15 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' ...@@ -4467,6 +4467,15 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
BUILD_SHARED=""
case $host in #(
*-apple-*) :
BUILD_SHARED="disable-shared" ;; #(
*) :
;;
esac
case `pwd` in case `pwd` in
*\ * | *\ *) *\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
...@@ -8427,14 +8436,21 @@ func_stripname_cnf () ...@@ -8427,14 +8436,21 @@ func_stripname_cnf ()
esac esac
} # func_stripname_cnf } # func_stripname_cnf
case $host in #(
*-apple-*) :
# Set options # Set options
# Check whether --enable-shared was given.
enable_dlopen=no
enable_win32_dll=no
# Check whether --enable-shared was given.
if test "${enable_shared+set}" = set; then : if test "${enable_shared+set}" = set; then :
enableval=$enable_shared; p=${PACKAGE-default} enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in case $enableval in
...@@ -8454,7 +8470,7 @@ if test "${enable_shared+set}" = set; then : ...@@ -8454,7 +8470,7 @@ if test "${enable_shared+set}" = set; then :
;; ;;
esac esac
else else
enable_shared=no enable_shared=yes
fi fi
...@@ -8465,14 +8481,6 @@ fi ...@@ -8465,14 +8481,6 @@ fi
enable_dlopen=no
enable_win32_dll=no
# Check whether --enable-static was given. # Check whether --enable-static was given.
if test "${enable_static+set}" = set; then : if test "${enable_static+set}" = set; then :
enableval=$enable_static; p=${PACKAGE-default} enableval=$enable_static; p=${PACKAGE-default}
...@@ -16068,11 +16076,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ...@@ -16068,11 +16076,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# Only expand once: # Only expand once:
;; #(
*) :
;;
esac
......
...@@ -52,11 +52,7 @@ dnl AC_MSG_RESULT(ok) ...@@ -52,11 +52,7 @@ dnl AC_MSG_RESULT(ok)
AC_PROG_INSTALL AC_PROG_INSTALL
dnl disable shared libraries on MacOS... sigh LT_INIT
AS_CASE([$host],
[*-apple-*], [LT_INIT([disable-shared])],
[LT_INIT]
)
AC_SUBST(LIBTOOL_DEPS) AC_SUBST(LIBTOOL_DEPS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment