X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.ac;h=84e629300c77c3afbef836b5a3d4e43c5cf09abb;hb=4614f17999007f93c7be926c2a2db232c78073ba;hp=175c2de3c57953c569bf45b3c04a346d1110bfcf;hpb=6417de785688c52d0d180eccaa52736f7509f26a;p=libfirm

diff --git a/configure.ac b/configure.ac
index 175c2de3c..84e629300 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,8 @@ dnl
 AC_PREREQ([2.54])
 AC_REVISION([$Id$])
 m4_define([firm_major_version], [1])
-m4_define([firm_minor_version], [12])
-m4_define([firm_micro_version], [1])
+m4_define([firm_minor_version], [13])
+m4_define([firm_micro_version], [0])
 m4_define([firm_version],
           [firm_major_version.firm_minor_version.firm_micro_version])
 AC_INIT([libfirm], [firm_version], [firm@ipd.info.uni-karlsruhe.de])
@@ -50,10 +50,8 @@ AC_ARG_ENABLE([debug],
 [AS_HELP_STRING([--disable-debug], [disable verifiers and additional debugging routines])],
 [enable_debug_libfirm="$enableval"], [enable_debug_libfirm="yes"])
 if test "$enable_debug_libfirm" = yes; then
-	FIRMCONFIG_DEBUG_libfirm="#define DEBUG_libfirm"
+	AC_DEFINE([DEBUG_libfirm], [], [define to enable debug mode and checks])
 fi
-AC_SUBST([FIRMCONFIG_DEBUG_libfirm])
-AC_SUBST([enable_debug_libfirm])
 
 AC_ARG_ENABLE([assert],
 [AS_HELP_STRING([--disable-assert], [disable assertions])],
@@ -63,18 +61,6 @@ if test "$enable_assert" = no; then
 fi
 AC_SUBST([enable_assert])
 
-dnl disable inlining
-dnl ----------------
-AC_ARG_ENABLE([inlining],
-[AS_HELP_STRING([--disable-inlining], [disable inline C-extension])],
-[enable_inlining="$enableval"], [enable_inlining="yes"])
-
-if test "$enable_inlining" = yes; then
-  FIRMCONFIG_USE_INLINING="#define USE_INLINING"
-fi
-AC_SUBST([FIRMCONFIG_USE_INLINING])
-AC_SUBST([enable_inlining])
-
 dnl set profiling
 dnl -------------
 AC_ARG_ENABLE([profile],
@@ -83,29 +69,6 @@ AC_ARG_ENABLE([profile],
 
 AC_SUBST([enable_profile_libfirm])
 
-dnl set heap analyses support
-dnl -------------------------
-AC_ARG_ENABLE([heapanalysis],
-[AS_HELP_STRING([--enable-heapanalysis], [Compile with heap analysis.])],
-[enable_heapanalysis=$enableval], [enable_heapanalysis="no"])
-
-if test "$enable_heapanalysis" = "yes"; then
-	FIRMCONFIG_DO_HEAPANALYSIS="#define DO_HEAPANALYSIS"
-fi
-AC_SUBST([FIRMCONFIG_DO_HEAPANALYSIS])
-AC_SUBST([enable_heapanalysis])
-
-dnl enable Firm hooks
-dnl -------------
-AC_ARG_ENABLE([hooks],
-[AS_HELP_STRING([--disable-hooks], [disable Firm hooks])],
-[enable_hooks="$enableval"], [enable_hooks="yes"])
-
-if test "$enable_hooks" = yes; then
-	FIRMCONFIG_FIRM_ENABLE_HOOKS="#define FIRM_ENABLE_HOOKS"
-fi
-AC_SUBST([FIRMCONFIG_FIRM_ENABLE_HOOKS])
-
 dnl enable Firm statistics
 dnl -------------
 AC_ARG_ENABLE([statistics],
@@ -126,21 +89,8 @@ AC_ARG_ENABLE([ilp],
 
 if test "$enable_ilp" = yes; then
   FIRMCONFIG_WITH_ILP="#define FIRMCONFIG_WITH_ILP"
+  AC_DEFINE([WITH_ILP], [], [enable to build code using ilp solvers])
 fi
-AC_SUBST([FIRMCONFIG_WITH_ILP])
-AC_SUBST(enable_ilp)
-
-dnl enable JVM calling from Firm
-dnl --------------------------------
-AC_ARG_ENABLE([jvm],
-[AS_HELP_STRING([--enable-jvm], [enable to call the jvm])],
-[enable_jvm="$enableval"], [enable_jvm="no"])
-
-if test "$enable_jvm" = yes; then
-  FIRMCONFIG_WITH_JVM="#define FIRMCONFIG_WITH_JVM"
-fi
-AC_SUBST([FIRMCONFIG_WITH_JVM])
-AC_SUBST(enable_jvm)
 
 dnl enable wchar_t support for identifiers
 dnl --------------------------------
@@ -227,6 +177,9 @@ AC_CONFIG_FILES([
 	libfirm.pc
 ])
 
+#always do inlining
+AC_DEFINE([INLINE], [inline], [define inline to compiler inline keyword])
+
 BACKENDS=""
 if test "$enable_backend" == yes; then
 	BACKENDS="arm ia32 mips ppc32"
@@ -242,7 +195,6 @@ echo "     backends              $BACKENDS"
 echo "     profiling             $enable_profile_libfirm"
 echo "     debug/verifiers       $enable_debug_libfirm"
 echo "     assertions            $enable_assert"
-echo "     hooks                 $enable_hooks"
 echo "     statistics            $enable_statistics"
 echo "     ilp                   $enable_ilp"
 echo "     jvm                   $enable_jvm"