- build/dist/install changes

[cacao.git] / configure.in

diff --git a/configure.in b/configure.in
index b5214346990766fc6ae315179201787f72f29fec..d36890279a8ec0e3c7379f3c0b74ca0ddcb945a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,6 @@
-dnl autoconf; autoheader; automake
-
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(cacao, 0.40, cacao@complang.tuwien.ac.at)
+
+AC_INIT(cacao, 0.90, cacao@complang.tuwien.ac.at)
 AC_CONFIG_SRCDIR(src/cacao/cacao.c)
 AC_CANONICAL_HOST
 AC_PREREQ(2.59)
@@ -11,6 +10,9 @@ AM_CONFIG_HEADER([config.h])
 
 AC_PREFIX_DEFAULT(/usr/local/cacao)
 
+dnl define install prefix
+CFLAGS="-DINSTALL_PREFIX=\"\\\"$prefix\\\"\""
+
 dnl system type
 
 case "$host_cpu" in
@@ -18,8 +20,6 @@ alpha* )
        ARCH_DIR="alpha"
         STATIC_CLASSPATH="1"
        CFLAGS="-mieee -D__ALPHA__"
-       AC_DEFINE([TRACE_ARGS_NUM], 6, [Defines integer argument register count])
-       AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])
        ;;
 
 i386* | i486* | i586* | i686* )
@@ -33,20 +33,18 @@ mips* )
         STATIC_CLASSPATH="1"
        CFLAGS="-64 -O2 -OPT:Olimit=0 -g -woff 1110,1164,1515 -D__MIPS__"
        LIBS="-lelfutil"
-       AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
        ;;
 
 powerpc* | ppc* )
        ARCH_DIR="powerpc"
         STATIC_CLASSPATH="1"
        CFLAGS="-D__POWERPC__"
-       AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
        ;;
 
 x86_64* )
        ARCH_DIR="x86_64"
         STATIC_CLASSPATH="1"
-       CFLAGS="-D__X86_64__"
+       CFLAGS="$CFLAGS -D__X86_64__"
        ;;
 
 sparc* | * )
@@ -252,11 +250,6 @@ else
 fi
 
 
-dnl set some essential classpath options, even if their classpath default is
-dnl suitable for us
-ac_configure_args="$ac_configure_args --enable-jni --disable-cni --disable-regen-headers --enable-static --enable-shared --enable-load-library"
-
-
 dnl check arguments
 AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [[default=no]])])
 
@@ -284,6 +277,11 @@ else
 fi
 
 
+dnl set some essential classpath options, even if their classpath default is
+dnl suitable for us
+ac_configure_args="$ac_configure_args --enable-jni --disable-cni --disable-regen-headers --enable-static --enable-shared --enable-load-library"
+
+
 dnl now configure boehm gc and gnu classpath
 dnl the export is not my favorite (is there another way?)
 export CFLAGS
@@ -292,6 +290,8 @@ AC_CONFIG_SUBDIRS(src/boehm-gc src/classpath)
 
 AC_OUTPUT(Makefile \
           doc/Makefile \
+          doc/handbook/Makefile \
+          man/Makefile \
           src/Makefile \
          src/cacao/Makefile \
           src/cacaoh/Makefile \