improvement

[libfirm] / configure.in

diff --git a/configure.in b/configure.in
index a9051fc..c021c89 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,7 @@ 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
@@ -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,18 +127,28 @@ 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 robodoc if enabled
+dnl check for doxygen if enabled
 dnl ----------------------------
 if test "$enable_auto_documentation" = yes; then
-  AC_CHECK_PROG(ROBODOC, robodoc, "robodoc", "")
-  if test "$ROBODOC" != "robodoc"; then
-    AC_MSG_ERROR(need robodoc for auto documentation (IPD: module add robodoc))
+  AC_CHECK_PROG(DOXYGEN, doxygen, "doxygen", "")
+  if test "$DOXYGEN" != "doxygen"; then
+    AC_MSG_ERROR(need doxygen for auto documentation)
+  fi
+  AC_CHECK_PROG(DOT, dot, "dot", "")
+  if test "$DOT" != "dot"; then
+    AC_MSG_ERROR(need dot for doxygen documentation (for class graphs) (IPD: module add Graphviz))
   fi
 fi
 
-
 dnl check for availability of a jdk
 dnl -------------------------------
 if test "$enable_firm_jni" = yes; then
@@ -166,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