X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.in;h=eaeb9e2f5dca5fd024a9c8dde13422bcf818ba7a;hb=910768f7422310c3e2a6588f32dff7729fc4768c;hp=cae51fa8aa40979663554166a6f0c4e7f0a3b597;hpb=20c0d0bc6ee1998d750dc7e7129fff2bd8dcc677;p=libfirm

diff --git a/configure.in b/configure.in
index cae51fa8a..eaeb9e2f5 100644
--- a/configure.in
+++ b/configure.in
@@ -13,17 +13,16 @@ 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
 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/lower/Makefile \
 		testprograms/Makefile firmjni/Makefile firmjni/testprograms/Makefile \
-		ir/be/Makefile \
 		libfirm.doxygen"
 
 dnl generate the config header file
@@ -36,21 +35,54 @@ AC_SUBST(libfirm_conf_env)
 dnl where is the configure file
 CONF_DIR_NAME=`dirname $0`
 
+dnl Package options
+dnl ===============
+
+dnl enabled external libFirm plugins
+dnl -------------
+AC_MSG_CHECKING([for external libfirm plugins])
+AC_ARG_WITH(plugins,
+[  --with-plugins=list     include external libfirm plugins list (space separated)],
+[
+  plugin_subdirs=$withval
+  plugin_files=
+  for i in $withval ; do
+    plugin_files="$i/Makefile $plugin_files"
+  done
+  ac_output_file="$ac_output_file $plugin_files"
+],
+[
+ plugin_files=
+ plugin_subdirs=
+])
+AC_SUBST(plugin_subdirs)
+if test "$plugin_subdirs" == ""; then
+  AC_MSG_RESULT([disabled])
+else
+  AC_MSG_RESULT([$plugin_subdirs])
+fi
+
 dnl check for additional include dirs
-AC_ARG_WITH(includedir, [  --with-includedir=add colon seperated list of directories to include search path],
+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'`)
 
 dnl check for additional library dirs
-AC_ARG_WITH(libdir, [  --with-libdir=add colon seperated list of directories to linker search path],
+AC_ARG_WITH(libdir, [  --with-libdir=add       colon seperated list of directories to linker search path],
     LDFLAGS=$LDFLAGS" -L"`echo $withval|sed 's;\:; -L;g'`)
 
 dnl check for libxml2 library installation dir
-AC_ARG_WITH(libxml2, [  --with-libxml2=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 Package options
-dnl ===============
+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 -------------
@@ -117,20 +149,12 @@ else
 fi
 AC_SUBST(enable_heapanalysis)
 
-dnl set backend support
-dnl -------------------------
-AC_ARG_ENABLE(backend, [  --enable-backend        Compile with backend facility.],
-[if test "$enableval" = "yes"; then
-  AC_DEFINE(FIRM_BACKEND)
-fi], [enable_backend="yes"])
-AC_SUBST(enable_backend)
-
 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
+  disable_libiberty=yes
 fi],
 [disable_libiberty=no])
 AC_SUBST(disable_libiberty)
@@ -163,6 +187,26 @@ AC_ARG_ENABLE(libcore,
 fi])
 AC_SUBST(enable_libcore)
 
+dnl enable ILP solver support
+dnl --------------------------------
+AC_ARG_ENABLE(ilp,
+[  --enable-ilp            enable ilp solver],
+[if test "$enableval"=yes; then
+  AC_DEFINE(WITH_ILP)
+fi])
+AC_SUBST(enable_ilp)
+
+
+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])
@@ -187,6 +231,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
@@ -367,5 +415,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