Commit 3814635a by Maarten L. Hekkelman

shared libraries, disable by default. Not my favourite, but hey, we need to…

shared libraries, disable by default. Not my favourite, but hey, we need to build on MacOS as well...
parent 2b6c09cf
...@@ -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=yes] --enable-shared[=PKGS] build shared libraries [default=no]
--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,15 +4467,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' ...@@ -4467,15 +4467,6 @@ 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
...@@ -8441,16 +8432,7 @@ func_stripname_cnf () ...@@ -8441,16 +8432,7 @@ func_stripname_cnf ()
# 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
...@@ -8470,7 +8452,7 @@ if test "${enable_shared+set}" = set; then : ...@@ -8470,7 +8452,7 @@ if test "${enable_shared+set}" = set; then :
;; ;;
esac esac
else else
enable_shared=yes enable_shared=no
fi fi
...@@ -8481,6 +8463,14 @@ fi ...@@ -8481,6 +8463,14 @@ 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}
......
...@@ -52,7 +52,8 @@ dnl AC_MSG_RESULT(ok) ...@@ -52,7 +52,8 @@ dnl AC_MSG_RESULT(ok)
AC_PROG_INSTALL AC_PROG_INSTALL
LT_INIT dnl disable shared libraries, they break the build on MacOS... sigh
LT_INIT([disable-shared])
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