X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.ac;h=457da0082c0c42e22fd78fa6f3caa367b2691ae1;hb=ce470efc35a72852c338aa15623b2a661dec1b34;hp=e48c47d683c8885fb0e87c97b8823faecff236e5;hpb=a910bf06a9b445df581fe0c0d5a1abd4114a2398;p=libfirm

diff --git a/configure.ac b/configure.ac
index e48c47d68..457da0082 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], [17])
 m4_define([firm_micro_version], [0])
 m4_define([firm_version],
           [firm_major_version.firm_minor_version.firm_micro_version])
@@ -26,6 +26,9 @@ AC_DEFINE([libfirm_VERSION_MAJOR], [firm_major_version], [Firms major version nu
 AC_DEFINE([libfirm_VERSION_MINOR], [firm_minor_version], [Firms minor version number])
 AC_DEFINE([libfirm_VERSION_MICRO], [firm_micro_version], [Firms micro version number])
 
+dnl enable libtool
+LT_INIT([win32-dll])
+
 dnl generate the config header file
 AC_CONFIG_HEADER([config.h])
 
@@ -61,18 +64,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 +72,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],
@@ -112,21 +92,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 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 ---------------
@@ -142,7 +109,6 @@ dnl ====================
 dnl check for a C compiler
 dnl ----------------------
 AC_PROG_CC
-AC_PROG_LIBTOOL
 
 AC_PATH_PROGS(PERL, perl perl5)
 
@@ -155,6 +121,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 =====================
@@ -194,15 +161,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])
@@ -216,9 +185,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 ""