Commit c2c315e0 authored by Erick's avatar Erick

Makefile / configure fixes

parent 0f2c4885
......@@ -86,16 +86,23 @@ ffi/stamp-h1
# Gc directory
gc/.*\.lo$
gc/.dirstamp
gc/.libs/
gc/atomic_ops.c
gc/atomic_ops_sysdeps.S
gc/bdw-gc.pc
gc/configure.lineno
gc/cord/.dirstamp
gc/gctest
gc/hugetest
gc/leaktest
gc/libatomic_ops
gc/libatomic_ops-1.*/src/config.h
gc/middletest
gc/smashtest
gc/tests/.dirstamp
gc/threadleaktest
gc/windows-untested
gc/atomic_ops.c
gc/atomic_ops_sysdeps.S
#gc/libatomic_ops
gc/.dirstamp
# GMP directory
gmp/config.h
......
......@@ -2,7 +2,7 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 11-Apr-2000 10:30 (eg)
# Last file update: 27-Sep-2009 19:39 (eg)
# Last file update: 3-Oct-2009 21:02 (eg)
EXTRA_DIST =
# INSTDIRS contains the dirs which need to be installed
......@@ -31,7 +31,7 @@ commit-version:
prep-version:
rm -rf /usr/tmp/$(VERSION_TAG) /usr/tmp/$(VERSION_BETA)* /usr/tmp/beta
hg clone . /usr/tmp/$(VERSION_TAG)
rm -rf /usr/tmp/$(VERSION_TAG)/.hg
rm -rf /usr/tmp/$(VERSION_TAG)/.hg*
hgclonedates `pwd` /usr/tmp/$(VERSION_TAG)
beta: commit-beta prep-version
......
......@@ -19,7 +19,7 @@
#
# Author: Erick Gallesio [eg@unice.fr]
# Creation date: 11-Apr-2000 10:30 (eg)
# Last file update: 27-Sep-2009 19:39 (eg)
# Last file update: 3-Oct-2009 21:02 (eg)
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
......@@ -733,7 +733,7 @@ commit-version:
prep-version:
rm -rf /usr/tmp/$(VERSION_TAG) /usr/tmp/$(VERSION_BETA)* /usr/tmp/beta
hg clone . /usr/tmp/$(VERSION_TAG)
rm -rf /usr/tmp/$(VERSION_TAG)/.hg
rm -rf /usr/tmp/$(VERSION_TAG)/.hg*
hgclonedates `pwd` /usr/tmp/$(VERSION_TAG)
beta: commit-beta prep-version
......
......@@ -6521,36 +6521,6 @@ case $withval in
esac
#1.0 ###
#1.0 ### check for GC
#1.0 ###
#1.0 if test "$THREADS" = lurc
#1.0 then
#1.0 AC_MSG_WARN([Using the bundled GC for LURC support])
#1.0 HAVE_GC="no"
#1.0 else
#1.0 AC_CHECK_LIB(gc, GC_malloc, HAVE_GC="yes", HAVE_GC="no", $LIBS)
#1.0 fi
#1.0
#1.0 # Test if the user want to force with our GC
#1.0 withval=""
#1.0 AC_ARG_WITH(provided-gc,
#1.0 [ --with-provided-gc use our GC version even the system provides one])
#1.0 case $withval in
#1.0 "yes") HAVE_GC="no";;
#1.0 "no") HAVE_GC="yes";;
#1.0 esac
#1.0
#1.0 # On Mac OS X use the given GC (to compile it without -Ox)
#1.0 case `uname -s` in
#1.0 Darwin*) echo "Force '--with-provided-gc' on MacOS";
#1.0 HAVE_GC="no" ;;
#1.0 *) true;;
#1.0 esac
#1.0
###
### configure libraries
###
......@@ -6572,26 +6542,6 @@ else
GMPINC=""
fi
#1.0 if test "$HAVE_GC" = "no"
#1.0 then
#1.0 echo "No Boehm-Demers-Weiser GC library. Using the one provided with the package"
#1.0 (cd gc; CC="$CC" CFLAGS="$CFLAGS" sh ./configure --prefix=$prefix \
#1.0 --includedir=$prefix/include/stklos \
#1.0 --enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; }
#1.0
#1.0 GC=gc
#1.0 GCLIB="../gc/.libs/libgc.a"
#1.0 GCINC="-I../gc/include"
#1.0 # Eventually add a distclean target to the GC Makefile
#1.0else
#1.0 echo "Using the system Boehm-Demers-Weiser library"
#1.0 GC=""
#1.0 GCLIB="-lgc"
#1.0 GCINC=""
#1.0 AC_DEFINE(HAVE_GC, [], [Use system GC])
#1.0fi
# ----------------------------------------------------------------------
# GC support
# ----------------------------------------------------------------------
......@@ -6935,12 +6885,6 @@ else
biglib="use the system library"
fi
#1.0 if test "$HAVE_GC" = "no"
#1.0 then
#1.0 gclib="compile provided library"
#1.0 else
#1.0 gclib="use the system library"
#1.0 fi
# LURC adjustment
LURCDIR=""
......
......@@ -2,7 +2,7 @@
###
### Author: Erick Gallesio [eg@unice.fr]
### Creation date: 28-Dec-1999 21:19 (eg)
### Last file update: 1-Oct-2009 23:12 (eg)
### Last file update: 3-Oct-2009 20:46 (eg)
AC_PREREQ(2.64)
AC_INIT([stklos], [0.99dev])
......@@ -171,36 +171,6 @@ case $withval in
esac
#1.0 ###
#1.0 ### check for GC
#1.0 ###
#1.0 if test "$THREADS" = lurc
#1.0 then
#1.0 AC_MSG_WARN([Using the bundled GC for LURC support])
#1.0 HAVE_GC="no"
#1.0 else
#1.0 AC_CHECK_LIB(gc, GC_malloc, HAVE_GC="yes", HAVE_GC="no", $LIBS)
#1.0 fi
#1.0
#1.0 # Test if the user want to force with our GC
#1.0 withval=""
#1.0 AC_ARG_WITH(provided-gc,
#1.0 [ --with-provided-gc use our GC version even the system provides one])
#1.0 case $withval in
#1.0 "yes") HAVE_GC="no";;
#1.0 "no") HAVE_GC="yes";;
#1.0 esac
#1.0
#1.0 # On Mac OS X use the given GC (to compile it without -Ox)
#1.0 case `uname -s` in
#1.0 Darwin*) echo "Force '--with-provided-gc' on MacOS";
#1.0 HAVE_GC="no" ;;
#1.0 *) true;;
#1.0 esac
#1.0
###
### configure libraries
###
......@@ -222,26 +192,6 @@ else
GMPINC=""
fi
#1.0 if test "$HAVE_GC" = "no"
#1.0 then
#1.0 echo "No Boehm-Demers-Weiser GC library. Using the one provided with the package"
#1.0 (cd gc; CC="$CC" CFLAGS="$CFLAGS" sh ./configure --prefix=$prefix \
#1.0 --includedir=$prefix/include/stklos \
#1.0 --enable-threads=$THREADS) || { echo "Cannot configure the GC"; exit; }
#1.0
#1.0 GC=gc
#1.0 GCLIB="../gc/.libs/libgc.a"
#1.0 GCINC="-I../gc/include"
#1.0 # Eventually add a distclean target to the GC Makefile
#1.0else
#1.0 echo "Using the system Boehm-Demers-Weiser library"
#1.0 GC=""
#1.0 GCLIB="-lgc"
#1.0 GCINC=""
#1.0 AC_DEFINE(HAVE_GC, [], [Use system GC])
#1.0fi
# ----------------------------------------------------------------------
# GC support
# ----------------------------------------------------------------------
......@@ -445,12 +395,6 @@ else
biglib="use the system library"
fi
#1.0 if test "$HAVE_GC" = "no"
#1.0 then
#1.0 gclib="compile provided library"
#1.0 else
#1.0 gclib="use the system library"
#1.0 fi
# LURC adjustment
LURCDIR=""
......
This diff is collapsed.
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