X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=configure;h=f8f60f97efa88bbe839a6e24628455dc4bb65f0c;hb=002120b9325bd7e1da3ebb9dd258350011ad863c;hp=ae8aaeeb3bb3bf24e51f2efe0a2230ddaac552b6;hpb=43885833e7092cb85a349a49277b3bdfa97eeae5;p=libfirm

diff --git a/configure b/configure
index ae8aaeeb3..f8f60f97e 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libfirm_conf_env plugin_subdirs XML2CONFIG enable_debug_libfirm enable_profile_libfirm enable_auto_documentation enable_firm_jni enable_heapanalysis disable_libiberty enable_statistics enable_libcore enable_wchar_support enable_external_effects CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT AWK LD ac_ct_LD libfirm_cv_prog_ld_r AR TAR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S DOXYGEN DOT JAVAC JAVAH CPP EGREP LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libfirm_conf_env plugin_subdirs XML2CONFIG enable_debug_libfirm enable_profile_libfirm enable_auto_documentation enable_firm_jni enable_heapanalysis disable_libiberty enable_statistics enable_libcore enable_ilp enable_jvm enable_wchar_support enable_external_effects CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT AWK LD ac_ct_LD libfirm_cv_prog_ld_r AR TAR RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S DOXYGEN DOT JAVAC JAVAH CPP EGREP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -850,9 +850,10 @@ Optional Features:
   --enable-heapanalysis   Compile with heap analysis.
   --disable-libiberty     disable own libiberty parts
   --disable-hooks         disable Firm hooks
-  --disable-inplace-edges disable Firm inplace edges
   --enable-statistics     enable Firm statistics
   --enable-libcore        enable libcore debugging
+  --enable-ilp            enable ilp solver
+  --enable-jvm            enable to call the jvm
   --enable-wchar-support  enable wchar_t support for identifiers (needed for java)
   --disable-external-effects  disable descriptions of external effects in XML
 
@@ -1546,46 +1547,72 @@ _ACEOF
 
 fi;
 
-# Check whether --enable-inplace_edges or --disable-inplace_edges was given.
-if test "${enable_inplace_edges+set}" = set; then
-  enableval="$enable_inplace_edges"
-  if test "$enableval" = yes; then
+# Check whether --enable-statistics or --disable-statistics was given.
+if test "${enable_statistics+set}" = set; then
+  enableval="$enable_statistics"
+  if test "$enableval"=yes; then
   cat >>confdefs.h <<\_ACEOF
-#define FIRM_EDGES_INPLACE 1
+#define FIRM_STATISTICS 1
 _ACEOF
 
 fi
-else
+fi;
+
+
+# Check whether --enable-libcore or --disable-libcore was given.
+if test "${enable_libcore+set}" = set; then
+  enableval="$enable_libcore"
+  if test "$enableval"=yes; then
   cat >>confdefs.h <<\_ACEOF
-#define FIRM_EDGES_INPLACE 1
+#define WITH_LIBCORE 1
 _ACEOF
 
-
+fi
 fi;
 
-# Check whether --enable-statistics or --disable-statistics was given.
-if test "${enable_statistics+set}" = set; then
-  enableval="$enable_statistics"
+
+echo "$as_me:$LINENO: checking for ilp solver support" >&5
+echo $ECHO_N "checking for ilp solver support... $ECHO_C" >&6
+# Check whether --enable-ilp or --disable-ilp was given.
+if test "${enable_ilp+set}" = set; then
+  enableval="$enable_ilp"
   if test "$enableval"=yes; then
   cat >>confdefs.h <<\_ACEOF
-#define FIRM_STATISTICS 1
+#define WITH_ILP 1
 _ACEOF
 
 fi
 fi;
 
+if test "$enable_ilp" == yes; then
+  echo "$as_me:$LINENO: result: enabled" >&5
+echo "${ECHO_T}enabled" >&6
+else
+  echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6
+fi
 
-# Check whether --enable-libcore or --disable-libcore was given.
-if test "${enable_libcore+set}" = set; then
-  enableval="$enable_libcore"
+echo "$as_me:$LINENO: checking for jvm support" >&5
+echo $ECHO_N "checking for jvm support... $ECHO_C" >&6
+# Check whether --enable-jvm or --disable-jvm was given.
+if test "${enable_jvm+set}" = set; then
+  enableval="$enable_jvm"
   if test "$enableval"=yes; then
   cat >>confdefs.h <<\_ACEOF
-#define WITH_LIBCORE 1
+#define WITH_JVM 1
 _ACEOF
 
 fi
 fi;
 
+if test "$enable_jvm" == yes; then
+  echo "$as_me:$LINENO: result: enabled" >&5
+echo "${ECHO_T}enabled" >&6
+else
+  echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6
+fi
+
 
 # Check whether --enable-wchar_support or --disable-wchar_support was given.
 if test "${enable_wchar_support+set}" = set; then
@@ -5914,6 +5941,8 @@ s,@enable_heapanalysis@,$enable_heapanalysis,;t t
 s,@disable_libiberty@,$disable_libiberty,;t t
 s,@enable_statistics@,$enable_statistics,;t t
 s,@enable_libcore@,$enable_libcore,;t t
+s,@enable_ilp@,$enable_ilp,;t t
+s,@enable_jvm@,$enable_jvm,;t t
 s,@enable_wchar_support@,$enable_wchar_support,;t t
 s,@enable_external_effects@,$enable_external_effects,;t t
 s,@CC@,$CC,;t t
@@ -6553,4 +6582,11 @@ if test "$no_create" != yes; then
 fi
 
 
+for i in $plugin_subdirs
+do
+	suffix=`echo $i | tr /a-z _A-Z`
+	echo "/* enabled plugin: $i */" >> config.h
+	echo "#define PLUGIN_$suffix 1" >> config.h
+done
+
 $AWK -f $CONF_DIR_NAME/filter.awk < config.h | sed -f $CONF_DIR_NAME/filter.sed > ir/config/firm_config.h