Minor corrections.

[libfirm] / configure.in

diff --git a/configure.in b/configure.in
index 76e4695..959bc0d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -25,9 +25,6 @@ ac_output_file="Makefile MakeRules ir/Makefile ir/adt/Makefile ir/debug/Makefile
                testprograms/Makefile firmjni/Makefile firmjni/testprograms/Makefile \
                libfirm.doxygen"
 
-dnl where is the configure file
-CONF_DIR_NAME=`dirname $0`
-
 dnl generate the config header file
 AC_CONFIG_HEADER(config.h)
 
@@ -35,6 +32,9 @@ dnl keep track of the environment set by the user
 libfirm_conf_env="${CC+CC='$CC'} ${CFLAGS+CFLAGS='$CFLAGS'} ${CPP+CPP='$CPP'} ${CPPFLAGS+CPPFLAGS='$CPPFLAGS'} ${LDFLAGS+LDFLAGS='$LDFLAGS'} ${LIBS+LIBS='$LIBS'}"
 AC_SUBST(libfirm_conf_env)
 
+dnl where is the configure file
+CONF_DIR_NAME=`dirname $0`
+
 dnl check for additional include dirs
 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="")
@@ -129,6 +129,23 @@ AC_ARG_ENABLE(statistics,
 fi])
 AC_SUBST(enable_statistics)
 
+dnl disable external effects in XML
+dnl -------------------------------
+AC_MSG_CHECKING([for using external effects in xml2])
+AC_ARG_ENABLE(external-effects,
+[  --disable-external-effects  disable descriptions of external effects in XML],
+[if test "$enableval"="no"; then
+  enable_external_effects=no
+fi],
+[enable_external_effects=yes])
+AC_SUBST(enable_external_effects)
+if test "$enable_external_effects" == no; then
+  AC_MSG_RESULT([disabled])
+else
+  AC_MSG_RESULT([enabled])
+fi
+dnl check for header and library below
+
 dnl Checks for programs.
 dnl ====================
 
@@ -257,6 +274,13 @@ if test "$enable_firm_jni" = yes; then
 fi
 
 
+if test "$enable_external_effects" == "yes"; then
+  AC_CHECK_HEADERS(libxml/parser.h, ac_xml_headers="yes", ac_xml_headers="no")
+  if test "$ac_xml_headers" != yes; then
+    AC_MSG_ERROR(xml header files not found. (IPD: add --with-includedir=/usr/public/libxml2/include/libxml2/ to configure flags))
+  fi
+fi
+
 dnl Checks for libraries.
 dnl =====================
 
@@ -276,6 +300,15 @@ if test "$ac_m_library" != yes; then
 fi
 
 
+if test "$enable_external_effects" == "yes"; then
+  AC_CHECK_LIB(xml2, xmlParseFile, ac_xml_library="yes", ac_xml_library="no")
+  if test "$ac_m_library" != yes; then
+    AC_MSG_ERROR("xml2 library not found (IPD: add --with-libdir=/usr/public/libxml2/lib/ to configure flags)")
+  else
+    LIBS=$LIBS" -lxml2"
+  fi
+fi
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl ==============================================================
 AC_C_CONST