X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.in;h=8999dc2d8aed6efd44cecfa5d0c867c36d51b263;hb=8fb3ce50cde68cff60b14725b205a7c80702a115;hp=4bca26dc92bab9b139c9c1aa529709bc767dbd9a;hpb=8128f777cc27c17fd528e09fd8b639a40a53bb1b;p=libfirm

diff --git a/configure.in b/configure.in
index 4bca26dc9..8999dc2d8 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ dnl
 
 AC_REVISION($Id$)
 
-AC_INIT(libfirm,0.3.0)
+AC_INIT(libfirm,1.3.0)
 AC_PREREQ(2.50)
 
 dnl if other files should be generated just add them to ac_output_files
@@ -21,7 +21,7 @@ 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/ana2/Makefile ir/stat/Makefile \
 		ir/opt/Makefile ir/external/Makefile ir/config/Makefile \
-		ir/arch/Makefile \
+		ir/arch/Makefile ir/lower/Makefile \
 		testprograms/Makefile firmjni/Makefile firmjni/testprograms/Makefile \
 		libfirm.doxygen"
 
@@ -71,9 +71,18 @@ AC_ARG_WITH(libdir, [  --with-libdir=add       colon seperated list of directori
     LDFLAGS=$LDFLAGS" -L"`echo $withval|sed 's;\:; -L;g'`)
 
 dnl check for libxml2 library installation dir
-AC_ARG_WITH(libxml2, [  --with-libxml2=prefix   installation prefix of libxml2 (IPD: --with-libxml2=/usr/public/libxml2)],
-    LDFLAGS=$LDFLAGS" -L"$withval"/lib";
-	CPPFLAGS=$CPPFLAGS" -I"$withval"/include/libxml2")
+dnl AC_ARG_WITH(libxml2, [  --with-libxml2=prefix   installation prefix of libxml2 (IPD: --with-libxml2=/usr/public/libxml2)],
+dnl     LDFLAGS=$LDFLAGS" -L"$withval"/lib";
+dnl 	CPPFLAGS=$CPPFLAGS" -I"$withval"/include/libxml2")
+
+dnl check for libxml2 library installation dir
+AC_CHECK_PROG(XML2CONFIG, xml2-config, "xml2-config", "echo")
+if test "$XML2CONFIG" != "xml2-config"; then
+  AC_MSG_ERROR(xml2-config for detecting libxml2 not found)
+fi
+AC_SUBST(XML2CONFIG)
+LDFLAGS=$LDFLAGS" -L/usr/lib `$XML2CONFIG --libs`";
+CPPFLAGS=$CPPFLAGS" `$XML2CONFIG --cflags`";
 
 dnl set debugging
 dnl -------------
@@ -160,16 +169,6 @@ fi],
 AC_DEFINE(FIRM_ENABLE_HOOKS)
 )
 
-dnl enable Firm inplace edges
-dnl -------------
-AC_ARG_ENABLE(inplace_edges,
-[  --disable-inplace-edges disable Firm inplace edges],
-[if test "$enableval" = yes; then
-  AC_DEFINE(FIRM_EDGES_INPLACE)
-fi],
-AC_DEFINE(FIRM_EDGES_INPLACE)
-)
-
 dnl enable Firm statistics
 dnl -------------
 AC_ARG_ENABLE(statistics,
@@ -188,6 +187,47 @@ AC_ARG_ENABLE(libcore,
 fi])
 AC_SUBST(enable_libcore)
 
+dnl enable ILP solver support
+dnl --------------------------------
+AC_MSG_CHECKING([for ilp solver support])
+AC_ARG_ENABLE(ilp,
+[  --enable-ilp            enable ilp solver],
+[if test "$enableval"=yes; then
+  AC_DEFINE(WITH_ILP)
+fi])
+AC_SUBST(enable_ilp)
+if test "$enable_ilp" == yes; then
+  AC_MSG_RESULT([enabled])
+else
+  AC_MSG_RESULT([disabled])
+fi
+
+dnl enable JVM calling from Firm
+dnl --------------------------------
+AC_MSG_CHECKING([for jvm support])
+AC_ARG_ENABLE(jvm,
+[  --enable-jvm            enable to call the jvm],
+[if test "$enableval"=yes; then
+  AC_DEFINE(WITH_JVM)
+fi])
+AC_SUBST(enable_jvm)
+if test "$enable_jvm" == yes; then
+  AC_MSG_RESULT([enabled])
+else
+  AC_MSG_RESULT([disabled])
+fi
+
+
+dnl enable wchar_t support for identifiers
+dnl --------------------------------
+AC_ARG_ENABLE(wchar_support,
+[  --enable-wchar-support  enable wchar_t support for identifiers (needed for java)],
+[if test "$enableval"=yes; then
+  AC_DEFINE(FIRM_ENABLE_WCHAR)
+fi])
+AC_SUBST(enable_wchar_support)
+
+
 dnl disable external effects in XML
 dnl -------------------------------
 AC_MSG_CHECKING([for using external effects in xml2])
@@ -212,6 +252,10 @@ dnl check for a C compiler
 dnl ----------------------
 AC_PROG_CC
 
+dnl check for awk
+dnl -------------
+AC_PROG_AWK
+
 dnl check for prelinkable linker
 dnl ----------------------------
 LIBFIRM_PROG_LD_R
@@ -392,5 +436,12 @@ dnl ===============
 
 AC_OUTPUT($ac_output_file,[ touch stamp-h ])
 
-dnl snip the lower prt of config.h and put it to ir/config/firm_config.h
-gawk -f $CONF_DIR_NAME/filter.awk < config.h | sed -f $CONF_DIR_NAME/filter.sed > ir/config/firm_config.h
+dnl snip the lower part of config.h and put it to ir/config/firm_config.h
+for i in $plugin_subdirs
+do
+	suffix=`echo $i | tr /a-z _A-Z`
+	echo "/* enabled plugin: $i */" >> config.h
+	echo "#define PLUGIN_$suffix 1" >> config.h
+done
+
+$AWK -f $CONF_DIR_NAME/filter.awk < config.h | sed -f $CONF_DIR_NAME/filter.sed > ir/config/firm_config.h