X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure.ac;h=d7e4b74465e70e84b794267ca843d68bc10b4ede;hb=bd4175dd9c290a499676ef53aa5c6c2106472c1d;hp=cecfe907b130cc7bed35cac245f422c757756c5c;hpb=0df3478d562c7019750973ae053ab6e6fdd330b0;p=libfirm

diff --git a/configure.ac b/configure.ac
index cecfe907b..d7e4b7446 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,12 @@ dnl Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
 dnl
 AC_PREREQ([2.54])
 AC_REVISION([$Id$])
-AC_INIT([libfirm], [1.10.0], [firm@ipd.info.uni-karlsruhe.de])
+m4_define([firm_major_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])
 AC_CONFIG_SRCDIR([ir/common/firm.c])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 1.9])
 
@@ -17,26 +22,13 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 1.9])
 LT_VERSION=0:0:0
 AC_SUBST([LT_VERSION])
 
+AC_DEFINE([libfirm_VERSION_MAJOR], [firm_major_version], [Firms major version number])
+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 generate the config header file
 AC_CONFIG_HEADER([config.h])
 
-AH_TOP([])
-
-AH_BOTTOM([
-#ifdef USE_INLINING
-#define INLINE inline
-#else
-#define INLINE
-#endif
-
-/* Firm statistics need hooks */
-#ifdef FIRM_STATISTICS
-#ifndef FIRM_ENABLE_HOOKS
-#define FIRM_ENABLE_HOOKS
-#endif
-#endif
-])
-
 dnl keep track of the environment set by the user
 libfirm_conf_env="${CC+CC='$CC'} ${CFLAGS+CFLAGS='$CFLAGS'} ${CPP+CPP='$CPP'} ${CPPFLAGS+CPPFLAGS='$CPPFLAGS'} ${LDFLAGS+LDFLAGS='$LDFLAGS'} ${LIBS+LIBS='$LIBS'}"
 AC_SUBST(libfirm_conf_env)
@@ -58,9 +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
-  AC_DEFINE([DEBUG_libfirm], [], [define to enable debugging stuff])
+	AC_DEFINE([DEBUG_libfirm], [], [define to enable debug mode and checks])
 fi
-AC_SUBST([enable_debug_libfirm])
 
 AC_ARG_ENABLE([assert],
 [AS_HELP_STRING([--disable-assert], [disable assertions])],
@@ -70,17 +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
-  AC_DEFINE([USE_INLINING], [], [use inlining])
-fi
-AC_SUBST([enable_inlining])
-
 dnl set profiling
 dnl -------------
 AC_ARG_ENABLE([profile],
@@ -89,62 +69,18 @@ AC_ARG_ENABLE([profile],
 
 AC_SUBST([enable_profile_libfirm])
 
-dnl set auto documentation
-dnl ----------------------
-AC_ARG_ENABLE([autodoc],
-[AS_HELP_STRING([--enable-autodoc], [enable auto documentation])],
-[enable_auto_documentation="$enableval"], [enable_auto_documentation="no"])
-
-AC_SUBST([enable_auto_documentation])
-
-dnl set firm jni
-dnl ------------
-AC_ARG_ENABLE([firmjni],
-[AS_HELP_STRING([--enable-firmjni], [check for tools necesarry to construct a java native interface for Firm])],
-[enable_firm_jni="$enableval"], [enable_firm_jni="no"])
-
-AC_SUBST(enable_firm_jni)
-
-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
-  AC_DEFINE([DO_HEAPANALYSIS], [], [enable heap analysis])
-fi
-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
-	AC_DEFINE([FIRM_ENABLE_HOOKS], [], [enable firm hooks])
-fi
-
 dnl enable Firm statistics
 dnl -------------
 AC_ARG_ENABLE([statistics],
 [AS_HELP_STRING([--enable-statistics], [enable Firm statistics])],
-[enable_statistics="$enableval"], [enable_statistics="no"])
+[enable_statistics="$enableval"], [enable_statistics="yes"])
 
 if test "$enable_statistics" = yes; then
-  AC_DEFINE([FIRM_STATISTICS], [], [enable statistics code])
+	FIRMCONFIG_FIRM_STATISTICS="#define FIRMCONFIG_FIRM_STATISTICS"
 fi
+AC_SUBST([FIRMCONFIG_FIRM_STATISTICS])
 AC_SUBST([enable_statistics])
 
-dnl enable libcore support
-dnl --------------------------------
-AC_ARG_ENABLE([libcore],
-[AS_HELP_STRING([--disable-libcore], [disable libcore support])],
-[enable_libcore="$enableval"],[enable_libcore="yes"])
-
-AC_SUBST([enable_libcore])
-
 dnl enable ILP solver support
 dnl --------------------------------
 AC_ARG_ENABLE([ilp],
@@ -152,39 +88,9 @@ AC_ARG_ENABLE([ilp],
 [enable_ilp="$enableval"], [enable_ilp="no"])
 
 if test "$enable_ilp" = yes; then
-  AC_DEFINE([WITH_ILP], [], [compile with ilp solver support])
+  FIRMCONFIG_WITH_ILP="#define FIRMCONFIG_WITH_ILP"
+  AC_DEFINE([WITH_ILP], [], [enable to build code using ilp solvers])
 fi
-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
-  AC_DEFINE([WITH_JVM], [], [compile with jvm support])
-fi
-AC_SUBST(enable_jvm)
-
-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
-  AC_DEFINE([FIRM_ENABLE_WCHAR], [], [enable wchar_t support for identifiers])
-fi
-AC_SUBST([enable_wchar_support])
-
-dnl disable external effects in XML
-dnl -------------------------------
-dnl AC_ARG_ENABLE([external-effects],
-dnl [AS_HELP_STRING([--enable-external-effects], [enable reading of descriptions of external effects in XML])],
-dnl [enable_external_effects="$enableval"], [enable_external_effects="no"])
-
-dnl AC_SUBST(enable_external_effects)
 
 dnl disable backend
 dnl ---------------
@@ -208,98 +114,11 @@ dnl check for awk
 dnl -------------
 AC_PROG_AWK
 
-dnl check for doxygen if enabled
-dnl ----------------------------
-if test "$enable_auto_documentation" = yes; then
-  AC_CHECK_PROG(DOXYGEN, doxygen, "doxygen", "")
-  if test "$DOXYGEN" != "doxygen"; then
-    AC_MSG_ERROR(need doxygen for auto documentation)
-  fi
-  AC_CHECK_PROG(DOT, dot, "dot", "")
-  if test "$DOT" != "dot"; then
-    AC_MSG_ERROR(need dot for doxygen documentation (for class graphs) (IPD: module add Graphviz))
-  fi
-fi
-
-dnl check for availability of a jdk
-dnl -------------------------------
-if test "$enable_firm_jni" = yes; then
-  AC_CHECK_PROG(JAVAC, javac, "javac", "")
-  if test "$JAVAC" != "javac"; then
-    AC_MSG_ERROR(need java compiler javac to generate jni (IPD: module add jdk-1.3.1-sun))
-  fi
-  AC_CHECK_PROG(JAVAH, javah, "javah", "")
-  if test "$JAVAH" != "javah"; then
-    AC_MSG_ERROR(need javah to generate jni headers (IPD: module add jdk-1.3.1-sun))
-  fi
-fi
-
-dnl check for availability of pkg-config
-PKG_PROG_PKG_CONFIG
-
-
 dnl Checks for header files.
 dnl ========================
 
 AC_HEADER_STDC
-
-dnl check for the math header file
-
-AC_CHECK_HEADERS(math.h, ac_math_headers="yes", ac_math_headers="no")
-if test "$ac_math_headers" != yes; then
-  dnl math header not found.
-  AC_MSG_ERROR("math header file not found")
-fi
-
-
-dnl check for the obstack header file
-dnl does not work with:
-dnl  - cygwin
-dnl  - MacOSX
-#AC_FUNC_OBSTACK
-
-AC_CHECK_HEADERS(obstack.h, ac_obstack_headers="yes", ac_obstack_headers="no")
-if test "$ac_obstack_headers" != yes; then
-  dnl obstack header not found.
-  AC_MSG_ERROR("obstack.h not found")
-fi
-
-
-AC_CHECK_HEADERS(alloca.h, ac_alloca_headers="yes", ac_alloca_headers="no")
-if test "$ac_alloca_headers" = "yes"; then
-    AC_DEFINE(HAVE_ALLOCA_H)
-else
-  if test "$ac_cv_header_stdc" = "no"; then
-    AC_MSG_ERROR("alloca.h and stdlib.h not found")
-  fi
-fi
-
-
-dnl check for jni header files
-
-if test "$enable_firm_jni" = yes; then
-  AC_CHECK_HEADERS(jni.h, ac_jni_headers="yes", ac_jni_headers="no")
-  if test "$ac_jni_headers" != yes; then
-    AC_MSG_ERROR(jni header file not found. (IPD: add --with-includedir=/usr/public2/java/jdk1.3.1-sun/include/:/usr/public2/java/jdk1.3.1-sun/include/linux/ to configure flags))
-  fi
-fi
-
-
-if test "$enable_external_effects" == "yes"; then
-	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`";
-
-	AC_CHECK_HEADERS(libxml/parser.h, ac_xml_headers="yes", ac_xml_headers="no")
-	if test "$ac_xml_headers" != yes; then
-		AC_MSG_ERROR(xml header files not found. (IPD: add --with-includedir=/usr/public/libxml2/include/libxml2/ to configure flags))
-	fi
-fi
+AC_CHECK_HEADERS([math.h], , AC_MSG_ERROR("math header file not found"))
 
 dnl Checks for libraries.
 dnl =====================
@@ -310,21 +129,6 @@ if test "$ac_m_library" != yes; then
   AC_MSG_ERROR("standard math library not found")
 fi
 
-
-if test "$enable_external_effects" == "yes"; then
-  AC_CHECK_LIB(xml2, xmlParseFile, ac_xml_library="yes", ac_xml_library="no")
-  if test "$ac_m_library" != yes; then
-    AC_MSG_ERROR("xml2 library not found (IPD: add --with-libdir=/usr/public/libxml2/lib/ to configure flags)")
-  else
-    LIBS=$LIBS" -lxml2"
-  fi
-fi
-
-if test "$enable_libcore" == "yes"; then
-	PKG_CHECK_MODULES([LIBCORE], [libcore])
-	AC_DEFINE([WITH_LIBCORE], [], [define to 1 to use the libcore])
-fi
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl ==============================================================
 AC_C_CONST
@@ -359,10 +163,9 @@ AC_CONFIG_FILES([
 	include/libfirm/Makefile
 	libfirm.pc
 ])
-AC_CONFIG_COMMANDS([stamp-h], [touch stamp-h])
-dnl snip the lower part of config.h and put it to firm_config.h
-AC_CONFIG_COMMANDS([firm_config.h],
-	[awk -f ${ac_top_srcdir}/filter.awk < ${ac_top_builddir}config.h > ${ac_top_builddir}firm_config.h])
+
+#always do inlining
+AC_DEFINE([INLINE], [inline], [define inline to compiler inline keyword])
 
 BACKENDS=""
 if test "$enable_backend" == yes; then
@@ -370,12 +173,6 @@ if test "$enable_backend" == yes; then
 fi
 AC_SUBST([BACKENDS])
 
-#if test "$BACKENDS"; then
-#	for backend in $BACKENDS; do
-#		AC_CONFIG_FILES([ir/be/$backend/Makefile])
-#	done
-#fi
-
 AC_OUTPUT
 
 dnl output summary of firm configuration
@@ -385,11 +182,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 "     libcore               $enable_libcore"
 echo "     ilp                   $enable_ilp"
-echo "     jvm                   $enable_jvm"
-echo "     wide char support     $enable_wchar_support"
-dnl echo "     external effects xml  $enable_external_effects"
 echo ""