Commit 6731a351 authored by Erick Gallesio's avatar Erick Gallesio

Fixed problems with --without-XXX configure options. Thank to Marijn

Schouten (hkBst)" <hkBst at gentoo dot org> for signaling it.
parent e34c298a
......@@ -5115,13 +5115,21 @@ fi
# Eventually force our gmp usage
withval=""
# Check whether --with-gmp-light was given.
if test "${with_gmp_light+set}" = set; then
withval=$with_gmp_light; HAVE_GMP="no"
withval=$with_gmp_light;
fi
case $withval in
"yes") HAVE_GMP="no";;
"no") HAVE_GMP="yes";;
esac
if test "$THREADS" = lurc
then
{ echo "$as_me:$LINENO: WARNING: Using the bundled GC for LURC support" >&5
......@@ -5198,13 +5206,19 @@ fi
fi
# Test if the user want to force with our GC
withval=""
# Check whether --with-provided-gc was given.
if test "${with_provided_gc+set}" = set; then
withval=$with_provided_gc; HAVE_GC="no"
withval=$with_provided_gc;
fi
case $withval in
"yes") HAVE_GC="no";;
"no") HAVE_GC="yes";;
esac
# On Mac OS X use the given GC (to compile it without -Ox)
case `uname -s` in
Darwin*) echo "Force '--with-provided-gc' on MacOS";
......@@ -5282,20 +5296,26 @@ fi
# Test if the user want to force with our PCRE lib
withval=""
# Check whether --with-provided-regexp was given.
if test "${with_provided_regexp+set}" = set; then
withval=$with_provided_regexp; HAVE_PCRE="no"
withval=$with_provided_regexp;
fi
case $withval in
"yes") HAVE_PCRE="no";;
"no") HAVE_PCRE="yes";;
esac
USE_LDAP="no"
LDAP_LIB=""
# Check whether --enable-ldap was given.
if test "${enable_ldap+set}" = set; then
enableval=$enable_ldap; USE_LDAP="yes"
enableval=$enable_ldap; USE_LDAP="$enableval"
fi
......@@ -6705,8 +6725,7 @@ if test "$HAVE_GC" = "no"
then
echo "No Boehm-Demers-Weiser GC library. Using the one provided with the package"
(cd gc; CC="$CC" CFLAGS="$CFLAGS" sh ./configure --prefix=$prefix \
--includedir=$prefix/include/stklos --enable-threads=$THREADS) \
|| { echo "Cannot configure the GC"; exit; }
--enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; }
GC=gc
GCLIB="../gc/.libs/libgc.a"
......
......@@ -2,7 +2,7 @@ dnl configure.in for STklos
dnl
dnl Author: Erick Gallesio [eg@unice.fr]
dnl Creation date: 28-Dec-1999 21:19 (eg)
dnl Last file update: 28-Feb-2007 22:08 (eg)
dnl Last file update: 21-May-2007 14:39 (eg)
AC_INIT(src/stklos.c)
......@@ -136,9 +136,16 @@ fi
# Eventually force our gmp usage
withval=""
AC_ARG_WITH(gmp-light,
[ --with-gmp-light use our GMP version even the system provides one],
HAVE_GMP="no")
[ --with-gmp-light use our GMP version even the system provides one])
case $withval in
"yes") HAVE_GMP="no";;
"no") HAVE_GMP="yes";;
esac
dnl
dnl check for GC
......@@ -152,9 +159,14 @@ else
fi
# Test if the user want to force with our GC
withval=""
AC_ARG_WITH(provided-gc,
[ --with-provided-gc use our GC version even the system provides one],
HAVE_GC="no")
[ --with-provided-gc use our GC version even the system provides one])
case $withval in
"yes") HAVE_GC="no";;
"no") HAVE_GC="yes";;
esac
# On Mac OS X use the given GC (to compile it without -Ox)
case `uname -s` in
......@@ -170,9 +182,14 @@ dnl
AC_CHECK_LIB(pcre, pcre_fullinfo, HAVE_PCRE="yes", HAVE_PCRE="no", $LIBS)
# Test if the user want to force with our PCRE lib
withval=""
AC_ARG_WITH(provided-regexp,
[ --with-provided-regexp use our PCRE regexp version],
HAVE_PCRE="no")
[ --with-provided-regexp use our PCRE regexp version])
case $withval in
"yes") HAVE_PCRE="no";;
"no") HAVE_PCRE="yes";;
esac
dnl
......@@ -183,7 +200,7 @@ LDAP_LIB=""
AC_ARG_ENABLE(ldap,
[ --enable-ldap enable ldap],
USE_LDAP="yes")
USE_LDAP="$enableval")
if test "$USE_LDAP" = "yes" ;then
AC_CHECK_HEADERS(ldap.h, USE_LDAP=yes, USE_LDAP=false)
......
No preview for this file type
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