X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.ac;h=f50b857efdcf49ae7935e5a06cef5b9c4616d03c;hb=dacd0e781b7f3af7b0033c53b47ad65d63619711;hp=395dd21e5fef3ecbdd7c5c9220967ab21d88a404;hpb=64403cb641209bf4f3db434e0109d74e3420f4fa;p=libfirm

diff --git a/configure.ac b/configure.ac
index 395dd21e5..f50b857ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ dnl
 AC_PREREQ([2.54])
 AC_REVISION([$Id$])
 m4_define([firm_major_version], [1])
-m4_define([firm_minor_version], [13])
+m4_define([firm_minor_version], [16])
 m4_define([firm_micro_version], [0])
 m4_define([firm_version],
           [firm_major_version.firm_minor_version.firm_micro_version])
@@ -61,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],
@@ -81,17 +69,6 @@ AC_ARG_ENABLE([profile],
 
 AC_SUBST([enable_profile_libfirm])
 
-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],
@@ -115,18 +92,6 @@ if test "$enable_ilp" = yes; then
   AC_DEFINE([WITH_ILP], [], [enable to build code using ilp solvers])
 fi
 
-dnl enable wchar_t support for identifiers
-dnl --------------------------------
-AC_ARG_ENABLE([wchar_support],
-[AS_HELP_STRING([--enable-wchar-support], [enable wchar_t support for identifiers (needed for java)])],
-[enable_wchar_support="$enableval"], [enable_wchar_support="no"])
-
-if test "$enable_wchar_support" = yes; then
-  FIRMCONFIG_FIRM_ENABLE_WCHAR="#define FIRM_ENABLE_WCHAR"
-fi
-AC_SUBST([FIRMCONFIG_FIRM_ENABLE_WCHAR])
-AC_SUBST([enable_wchar_support])
-
 dnl disable backend
 dnl ---------------
 AC_ARG_ENABLE([backend],
@@ -154,6 +119,7 @@ dnl ========================
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([math.h], , AC_MSG_ERROR("math header file not found"))
+AC_CHECK_HEADERS([alloca.h])
 
 dnl Checks for libraries.
 dnl =====================
@@ -193,15 +159,17 @@ dnl ===============
 
 dnl Output results
 AC_CONFIG_FILES([
-	firm_config.h
 	Makefile
 	ir/Makefile
 	include/libfirm/Makefile
 	libfirm.pc
 ])
 
+#always do inlining
+AC_DEFINE([INLINE], [inline], [define inline to compiler inline keyword])
+
 BACKENDS=""
-if test "$enable_backend" == yes; then
+if test "$enable_backend" = yes; then
 	BACKENDS="arm ia32 mips ppc32"
 fi
 AC_SUBST([BACKENDS])
@@ -215,9 +183,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"
-echo "     wide char support     $enable_wchar_support"
 echo ""