X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.in;h=b760217424f56e8e62f419dffe856b3422de4270;hb=4d2013dc57776f3d97a74801c3d29eed7ed76a82;hp=472e392eae069ca9be9b850de6253e775346446c;hpb=9da0ea8b2048223b00f46f76479faa5dad3f5ff3;p=libfirm

diff --git a/configure.in b/configure.in
index 472e392ea..b76021742 100644
--- a/configure.in
+++ b/configure.in
@@ -7,13 +7,14 @@ dnl $Id$
 AC_REVISION($Id$)
 
 
+
 AC_INIT(libfirm,0.3.0)
 AC_PREREQ(2.50)
 dnl if other files should be generated just add them to ac_output_files
 ac_output_file="Makefile MakeRules ir/Makefile ir/adt/Makefile ir/debug/Makefile \
 		ir/tv/Makefile ir/common/Makefile ir/ident/Makefile ir/ir/Makefile \
 		ir/ana/Makefile ir/tr/Makefile ir/st/Makefile testprograms/Makefile \
-		firmjni/Makefile firmjni/build_firm_jni firmjni/testprograms/Makefile"
+		firmjni/Makefile firmjni/testprograms/Makefile libfirm.doxygen"
 
 dnl generate the config header file
 AC_CONFIG_HEADER(config.h)
@@ -23,8 +24,8 @@ libfirm_conf_env="${CC+CC='$CC'} ${CFLAGS+CFLAGS='$CFLAGS'} ${CPP+CPP='$CPP'} ${
 AC_SUBST(libfirm_conf_env)
 
 dnl check for additional include dirs
-AC_ARG_WITH(includedir, [  --with-includedir=dir add directory to include search path],
-    CPPFLAGS=$CPPFLAGS" -I"$withval, T_FLAG="")
+AC_ARG_WITH(includedir, [  --with-includedir=add colon seperated list of directories to include search path],
+    CPPFLAGS=$CPPFLAGS" -I"`echo $withval|sed 's;\:; -I;g'`, T_FLAG="")
 
 dnl Package options
 dnl ===============
@@ -79,6 +80,16 @@ fi],
 [enable_firm_jni=no])
 AC_SUBST(enable_firm_jni)
 
+dnl disable linking of libiberty parts (xmalloc, xprintf, obstack, ...)
+dnl ----------------------
+AC_ARG_ENABLE(libiberty,
+[  --disable-libiberty        disable own libiberty parts],
+[if test "$enableval"=yes; then
+  disable_libiberty_=yes
+fi],
+[disable_libiberty=no])
+AC_SUBST(disable_libiberty)
+
 
 dnl Checks for programs.
 dnl ====================
@@ -116,6 +127,13 @@ AC_PROG_RANLIB
 
 AC_PROG_INSTALL
 
+touch tmp-install.a tmp-install.b
+if eval "$INSTALL -C tmp-install.a tmp-install.b" ; then
+    INSTALL="$INSTALL -C"
+fi
+rm tmp-install.a tmp-install.b
+
+
 AC_PROG_LN_S
 
 dnl check for doxygen if enabled
@@ -169,11 +187,13 @@ fi
 
 
 dnl check for the obstack header file
+AC_FUNC_OBSTACK
 
-AC_CHECK_HEADERS(obstack.h, ac_obstack_headers="yes", ac_obstack_headers="no")
-if test "$ac_obstack_headers" != yes; then
+#AC_CHECK_HEADERS(obstack.h, ac_obstack_headers="yes", ac_obstack_headers="no")
+#if test "$ac_obstack_headers" != yes; then
+if test "$ac_cv_func_obstack" != "yes"; then
   dnl obstack header not found.
-  AC_MSG_ERROR("obstack header file not found")
+  AC_MSG_ERROR("no obstack support")
 fi
 
 
@@ -182,7 +202,7 @@ dnl check for jni header files
 if test "$enable_firm_jni" = yes; then
   AC_CHECK_HEADERS(jni.h, ac_jni_headers="yes", ac_jni_headers="no")
   if test "$ac_jni_headers" != yes; then
-    AC_MSG_ERROR(jni header file not found. (IPD: add -I/usr/public2/java/jdk1.3.1-sun/include/ -I/usr/public2/java/jdk1.3.1-sun/include/linux/ to CPPFLAGS))
+    AC_MSG_ERROR(jni header file not found. (IPD: add --with-includedir=/usr/public2/java/jdk1.3.1-sun/include/:/usr/public2/java/jdk1.3.1-sun/include/linux/ to configure flags))
   fi
 fi