Permalink
Browse files

changes to configure the whole tree

targets all and bootstrap mean the same thing at this level: this is so
that the bootstrap target will propagate down to share/lib.  however,
locally, all and bootstrap may mean different things.
TOPDIR is sanitized with respect to a leading `.' and substituted into
makefiles because recursive makes need to find executables with respect
to TOPDIR, e.g. in Makefile.boot which is included by Makefiles at
various depth in the tree.


git-svn-id: https://gforge.info.ucl.ac.be/svn/mozart@5759 ada56829-ad1f-0410-b00f-83cda6628aec
  • Loading branch information...
duchier
duchier committed Apr 12, 1998
1 parent 6354a0d commit 608fba905efdc8fa9acdbf7ed14aabbffc01a8ed
Showing with 89 additions and 30 deletions.
  1. +25 −6 INSTALL
  2. +17 −13 Makefile.in
  3. +1 −0 aclocal.m4
  4. +39 −7 configure
  5. +7 −4 configure.in
View
31 INSTALL
@@ -14,10 +14,14 @@ INSTALLATION INSTRUCTIONS FOR THE MOZART SYSTEM
* Fast installation
+Recommendations:
+ OZHOME should not be set in your environment
+ your PATH should not include a directory in which Oz executables
+ or scripts may be found
+
./configure
make
make install
-# use make bootstrap if you have no Oz system installed yet.
* Multi platform installation
@@ -32,6 +36,14 @@ make install
--prefix=<dir> (default: /usr/local/oz)
where to install the system
+ --disable-wish
+ in case you have already installed the wish component of Oz
+ and prefer to leave it alone (perhaps because you don't have
+ a nice tcl/tk installation)
+ --enable-contrib[=gdbm,regex] (default: NONE)
+ also configure these contributions. they are not included by
+ default because they require other packages to be installed
+ which may not be present.
* variables
@@ -50,16 +62,23 @@ before running configure the following variables can be set
$oz_gmp_inc_dir
Where to find GNU mp libraries and headers
-* targets
+ $oz_enable_wish
+ Whether to include wish in the configuration
- make [all]
- compile the system
- lib needs preinstalled components
+ $oz_enable_contrib
+ Which contributions to include in the configuration
- make bootstrap
+* targets
+
+ make [bootstrap]
compile the system
creates the components in lib using the assembler version of ozbatch
+ make all
+ in the top level directory this is the same as make bootstrap
+ in other directories, this will typically use Oz executable that
+ have already been installed
+
make install
install the system under $prefix
View
@@ -1,3 +1,6 @@
+@SET_MAKE@
+
+BUILDTOP= @BUILDTOP@
SRCDIR = @srcdir@
TOPDIR = @srcdir@
@@ -9,15 +12,15 @@ PREFIX= @prefix@
OZVERSION= $(TOPDIR)/OZVERSION
-SUBDIRS= bin elisp ozwish Emulator lib
+SUBDIRS= platform share contrib
PLATFORMS= solaris-sparc aix3-rs600 freebsd-i486 hpux-700\
irix5-mips linux-i486 netbsd-i486 netbsd-m68k netbsd-sparc\
osf1-alpha solaris-i486 sunos-sparc win32-i486
DISTDIR= dist
-FILES= README* LICENSE
+FILES= $(wildcard README*) LICENSE
ALLFILES= $(FILES:%=$(PREFIX)/%)
DIRS= bin demo include lib platform tools man
@@ -37,25 +40,26 @@ ZIP = gzip -9
CACHEDIR=oz/cache/http/www.ps.uni-sb.de/PREFIX/lib
-.PHONY: all install clean distclean realclean veryclean World files
-
-all:
+.PHONY: bootstrap all install clean distclean realclean veryclean World files check
-all install clean realclean depend distclean:
- dirs="$(SUBDIRS)"; for i in $$dirs; do (cd $$i && $(MAKE) $@); done
+bootstrap::
+all:: bootstrap
-veryclean: realclean
+clean veryclean realclean distclean::
+ -$(RM) *~
-install: $(ALLDIRS) $(ALLFILES)
+distclean::
+ -$(RM) Makefile config.cache config.log config.status
-bootstrap:
- (cd Emulator; make)
- (cd lib; make bootstrap)
+check bootstrap all install clean veryclean realclean depend distclean::
+ dirs="$(SUBDIRS)"; for i in $$dirs; do (cd $$i && $(MAKE) $@); done
+install:: $(ALLFILES)
+$(ALLFILES): $(PREFIX)/% : % $(PREFIX)
$(ALLFILES):
$(INSTALL_OTHER) $(FILES) $(PREFIX)
-$(ALLDIRS) $(DISTDIR):
+$(PREFIX) $(DISTDIR):
$(MKINSTALLDIRS) $@
pack-all: common $(PLATFORMS)
View
@@ -22,6 +22,7 @@ AC_DEFUN(OZ_INIT, [
fi
AC_SUBST(TOPDIR)
oz_topdira=`cd $TOPDIR; pwd`
+ TOPDIR=$oz_topdira
])
AC_DEFUN(OZ_PATH_PROG, [
View
@@ -589,8 +589,39 @@ echo "$ac_t""$host" 1>&6
fi
oz_topdira=`cd $TOPDIR; pwd`
+ TOPDIR=$oz_topdira
+BUILDTOP=`pwd`
+
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:600: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftestmake <<\EOF
+all:
+ @echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+else
+ eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ SET_MAKE=
+else
+ echo "$ac_t""no" 1>&6
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -602,7 +633,7 @@ echo "$ac_t""$host" 1>&6
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:606: checking for a BSD compatible install" >&5
+echo "configure:637: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -660,7 +691,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "mkinstalldirs", so it can be a program name with args.
set dummy mkinstalldirs; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:664: checking for $ac_word" >&5
+echo "configure:695: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_MKINSTALLDIRS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -695,8 +726,7 @@ fi
fi
-#AC_CONFIG_SUBDIRS(bin elisp ozwish Emulator lib)
-subdirs="platform/emulator platform/tools/gump platform/wish share"
+subdirs="platform share contrib"
trap '' 1 2 15
@@ -812,7 +842,7 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "Makefile contrib/conf.all:contrib/conf.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -848,6 +878,8 @@ s%@host_cpu@%$host_cpu%g
s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@TOPDIR@%$TOPDIR%g
+s%@BUILDTOP@%$BUILDTOP%g
+s%@SET_MAKE@%$SET_MAKE%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
@@ -893,7 +925,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"Makefile contrib/conf.all:contrib/conf.in"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -989,7 +1021,7 @@ if test "$no_recursion" != yes; then
esac
done
- for ac_config_dir in platform/emulator platform/tools/gump platform/wish share; do
+ for ac_config_dir in platform share contrib; do
# Do not complain, so a configure script can configure whichever
# parts of a large source tree are present.
View
@@ -4,7 +4,7 @@ dnl Authors:
dnl Michael Mehl (mehl@dfki.de)
dnl
dnl Contributors:
-dnl optional, Contributor's name (Contributor's email address)
+dnl Denys Duchier, (duchier@ps.uni-sb.de)
dnl
dnl Copyright:
dnl Michael Mehl (1997)
@@ -35,16 +35,19 @@ AC_INIT(OZVERSION)
OZ_INIT
+BUILDTOP=`pwd`
+AC_SUBST(BUILDTOP)
+
+AC_PROG_MAKE_SET
AC_PROG_INSTALL
#OZ_PATH_PROG(PLATFORMSCRIPT, ozplatform)
#OZ_PATH_PROG(DYNLD, ozdynld)
OZ_PATH_PROG(MKINSTALLDIRS, mkinstalldirs)
-#AC_CONFIG_SUBDIRS(bin elisp ozwish Emulator lib)
-AC_CONFIG_SUBDIRS(platform/emulator platform/tools/gump platform/wish share)
+AC_CONFIG_SUBDIRS(platform share contrib)
-AC_OUTPUT(Makefile contrib/conf.all:contrib/conf.in)
+AC_OUTPUT(Makefile)
errprint(ifdef([OZ_INIT],
[autoconf succeeded.

0 comments on commit 608fba9

Please sign in to comment.