X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.in;h=ebc2016855754be61b5bcc7f60acdbde24e43387;hb=2cdd7d2a9c2c79b2dc1b326060f547ae6cdeab46;hp=44c4f549dcc2ab4f1718a57aa95751aaa3701149;hpb=b11badc4e6617cefd1ed6283c56ab2d42cb5ba0a;p=libfirm

diff --git a/configure.in b/configure.in
index 44c4f549d..ebc201685 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,6 +169,16 @@ 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,
@@ -202,6 +221,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
@@ -382,5 +405,5 @@ 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
+$AWK -f $CONF_DIR_NAME/filter.awk < config.h | sed -f $CONF_DIR_NAME/filter.sed > ir/config/firm_config.h