From 0a77472a24f6df7ff91a18a854bb5f3023c0b62f Mon Sep 17 00:00:00 2001 From: douglas Date: Sat, 17 Apr 2010 10:43:03 +0000 Subject: [PATCH] Variable arguments and work with make even if make isn't GNU make when GNU make is installed. --- GNUmakefile.in | 8 +- Makefile.in | 10 +++ configure | 210 ++++++++++++++----------------------------------- configure.ac | 31 ++++---- 4 files changed, 91 insertions(+), 168 deletions(-) create mode 100644 Makefile.in diff --git a/GNUmakefile.in b/GNUmakefile.in index 1e2628c..a47947c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # @configure_input@ -SHELL := @_BASH@ +SHELL := $(shell which @BASH@) VPATH := @srcdir@ ifndef PKG_TARG @@ -15,7 +15,7 @@ flex := @FLEX@ libtool := @LIBTOOL@ cxx := @CXX@ objcxx := @OBJCXX@ -cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 @DEFS@ +cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 $(filter -DHAVE_FFI%,@DEFS@) objcxxflags := @OBJCXXFLAGS@ ldflags := @LDFLAGS@ library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@ @@ -178,11 +178,11 @@ all: $(all) clean:: rm -rf *.lo *.o *.d *.t.hpp .libs */*.lo */.libs libcycript.la $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.yy Cycript.l control Bridge.gperf Bridge.hpp Cycript.output ifneq ($(srcdir),.) - rm -rf sig ObjectiveC + rm -rf Mach ObjectiveC sig endif distclean: clean - rm -f GNUmakefile config.log config.status libtool + rm -f GNUmakefile Makefile config.log config.status libtool %.yy: %.yy.in $(srcdir)/Filter.sh <$< >$@ $(filters) diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..9fe91c1 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,10 @@ +# @configure_input@ +# The real makefile is GNUmakefile + +gmake=@GMAKE@ + +all: + $(gmake) $@ + +.DEFAULT: + $(gmake) $@ diff --git a/configure b/configure index 8b34762..cb5ca0f 100755 --- a/configure +++ b/configure @@ -821,15 +821,14 @@ INSTALL_PROGRAM LTLIBAPR TIME GPERF -_BASH -FLEX +BASH LEXLIB LEX_OUTPUT_ROOT LEX -BISON -AWK +FLEX YFLAGS YACC +BISON ac_ct_OBJCXX OBJCXXFLAGS OBJCXX @@ -837,6 +836,7 @@ CXXCPP ac_ct_CXX CXXFLAGS CXX +GMAKE ifGNUmake PKG_CONFIG CPP @@ -944,13 +944,16 @@ CCC CXXCPP OBJCXX OBJCXXFLAGS +BISON YACC YFLAGS +FLEX GPERF WEBKIT_CFLAGS WEBKIT_LIBS LIBFFI_CFLAGS -LIBFFI_LIBS' +LIBFFI_LIBS +GNUSTEP_CONFIG' # Initialize some variables set by options. @@ -1572,10 +1575,9 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --disable-rpath do not hardcode runtime library paths --enable-javascript[=ENGINE] - Enable the JavaScript runtime (currently the only + use a JavaScript runtime (currently the only available option for ENGINE is JavaScriptCore) [default=yes] - --disable-javascript Disable the JavaScript runtime Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1606,11 +1608,13 @@ Some influential environment variables: CXXCPP C++ preprocessor OBJCXX Objective C++ compiler command OBJCXXFLAGS Objective C++ compiler flags + BISON GNU Project parser generator (yacc replacement) YACC The `Yet Another C Compiler' implementation to use. Defaults to the first program found out of: `bison -y', `byacc', `yacc'. YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. + FLEX the fast lexical analyser generator GPERF perfect hash function generator WEBKIT_CFLAGS C compiler flags for WEBKIT, overriding pkg-config @@ -1618,6 +1622,8 @@ Some influential environment variables: LIBFFI_CFLAGS C compiler flags for LIBFFI, overriding pkg-config LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config + GNUSTEP_CONFIG + prints information about the current gnustep installation Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4104,13 +4110,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4107: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4113: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4110: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4116: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4113: output\"" >&5) + (eval echo "\"\$as_me:4119: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5316,7 +5322,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5319 "configure"' > conftest.$ac_ext + echo '#line 5325 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6841,11 +6847,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6844: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6850: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6848: \$? = $ac_status" >&5 + echo "$as_me:6854: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7180,11 +7186,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7183: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7189: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7187: \$? = $ac_status" >&5 + echo "$as_me:7193: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7285,11 +7291,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7288: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7294: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7292: \$? = $ac_status" >&5 + echo "$as_me:7298: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7340,11 +7346,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7343: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7349: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7347: \$? = $ac_status" >&5 + echo "$as_me:7353: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9724,7 +9730,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9727 "configure" +#line 9733 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9820,7 +9826,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9823 "configure" +#line 9829 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10189,7 +10195,9 @@ $as_echo "\"Not found\"" >&6; }; fi -if test "x$_cv_gnu_make_command" = x; then : +GMAKE=$_cv_gnu_make_command + +if test "x$GMAKE" = x; then : as_fn_error "You need GNU make" "$LINENO" 5 fi ac_ext=cpp @@ -12597,11 +12605,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12600: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12608: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12604: \$? = $ac_status" >&5 + echo "$as_me:12612: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12696,11 +12704,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12699: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12707: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12703: \$? = $ac_status" >&5 + echo "$as_me:12711: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12748,11 +12756,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12759: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12755: \$? = $ac_status" >&5 + echo "$as_me:12763: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14031,74 +14039,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed for ac_prog in 'bison -y' byacc do @@ -14143,6 +14083,7 @@ fi done test -n "$YACC" || YACC="yacc" +if test "x$BISON" = x; then : @@ -14171,7 +14112,7 @@ $as_echo "$ax_cv_prog_bison" >&6; } : BISON=`echo $YACC | $SED -e 's/ -y//'` - BISON_VERSION=`$BISON -V | $SED -e 's/^bison (GNU Bison) \(.*\)$/\1/p;d'` + else @@ -14181,50 +14122,10 @@ else fi -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AWK" && break -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if bison is >= 2.3" >&5 $as_echo_n "checking if bison is >= 2.3... " >&6; } +BISON_VERSION=`$BISON -V | $SED -e 's/^bison (GNU Bison) \(.*\)$/\1/p;d'` as_arg_v1=$BISON_VERSION as_arg_v2=2.3 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null @@ -14425,6 +14326,7 @@ fi if test "$LEX" = :; then LEX=${am_missing_run}flex fi +if test "x$FLEX" = x; then : @@ -14453,7 +14355,7 @@ $as_echo "$ax_cv_prog_flex" >&6; } : FLEX=$LEX - FLEX_VERSION=`$FLEX --version | $SED -e 's/^.* \([0-9.]*\)$/\1/p;d'` + else @@ -14463,6 +14365,8 @@ else fi +fi +FLEX_VERSION=`$FLEX --version | $SED -e 's/^.* \([0-9.]*\)$/\1/p;d'` { $as_echo "$as_me:${as_lineno-$LINENO}: checking if flex is >= 2.5.33" >&5 $as_echo_n "checking if flex is >= 2.5.33... " >&6; } as_arg_v1=$FLEX_VERSION @@ -14484,18 +14388,17 @@ $as_echo "yes" >&6; } ;; #( *) : ;; esac - for ac_prog in bash do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog__BASH+set}" = set; then : +if test "${ac_cv_prog_BASH+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test -n "$_BASH"; then - ac_cv_prog__BASH="$_BASH" # Let the user override the test. + if test -n "$BASH"; then + ac_cv_prog_BASH="$BASH" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -14504,7 +14407,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog__BASH="$ac_prog" + ac_cv_prog_BASH="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -14514,17 +14417,17 @@ IFS=$as_save_IFS fi fi -_BASH=$ac_cv_prog__BASH -if test -n "$_BASH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_BASH" >&5 -$as_echo "$_BASH" >&6; } +BASH=$ac_cv_prog_BASH +if test -n "$BASH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5 +$as_echo "$BASH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$_BASH" && break + test -n "$BASH" && break done @@ -18299,6 +18202,7 @@ fi else + for ac_prog in gnustep-config do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -18427,6 +18331,12 @@ fi +fi +if test "x$GMAKE" != xmake; then : + + ac_config_files="$ac_config_files Makefile" + + fi ac_config_files="$ac_config_files GNUmakefile" @@ -19040,7 +18950,6 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' -AWK='$AWK' test -n "\$AWK" || AWK=awk _ACEOF @@ -19491,6 +19400,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.ac b/configure.ac index 4e18eb0..98a76cb 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,8 @@ AC_CONFIG_AUX_DIR([.]) LT_INIT([disable-static]) PKG_PROG_PKG_CONFIG([0.22]) CHECK_GNU_MAKE -AS_IF([test "x$_cv_gnu_make_command" = x], [AC_MSG_ERROR([You need GNU make])]) +AC_SUBST([GMAKE], [$_cv_gnu_make_command]) +AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])]) AC_PROG_CXX AC_PROG_OBJCXX AC_ARG_WITH([frameworks], [AS_HELP_STRING( @@ -19,29 +20,27 @@ AC_ARG_WITH([frameworks], [AS_HELP_STRING( done ]) AC_LANG([C++]) -AC_PROG_SED -AX_PROG_BISON([ - BISON=`echo $YACC | $SED -e 's/ -y//'` - BISON_VERSION=`$BISON -V | $SED -e 's/^bison (GNU Bison) \(.*\)$/\1/p;d'` -], [AC_MSG_ERROR([You need bison 2.3 or greater])]) -AC_PROG_AWK +AC_ARG_VAR([BISON], [GNU Project parser generator (yacc replacement)]) +AS_IF([test "x$BISON" = x], [AX_PROG_BISON([ + AC_SUBST([BISON], [`echo $YACC | $SED -e 's/ -y//'`]) +], [AC_MSG_ERROR([You need bison 2.3 or greater])])]) AC_MSG_CHECKING([if bison is >= 2.3]) +BISON_VERSION=[`$BISON -V | $SED -e 's/^bison (GNU Bison) \(.*\)$/\1/p;d'`] AS_VERSION_COMPARE([$BISON_VERSION], [2.3], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([You need bison 2.3 or greater]) ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])]) -AC_SUBST([BISON]) -AX_PROG_FLEX([ - FLEX=$LEX - FLEX_VERSION=[`$FLEX --version | $SED -e 's/^.* \([0-9.]*\)$/\1/p;d'`] -], [AC_MSG_ERROR([You need flex 2.5.33 or greater])]) +AC_ARG_VAR([FLEX], [the fast lexical analyser generator]) +AS_IF([test "x$FLEX" = x], [AX_PROG_FLEX([ + AC_SUBST([FLEX], [$LEX]) +], [AC_MSG_ERROR([You need flex 2.5.33 or greater])])]) +FLEX_VERSION=[`$FLEX --version | $SED -e 's/^.* \([0-9.]*\)$/\1/p;d'`] AC_MSG_CHECKING([if flex is >= 2.5.33]) AS_VERSION_COMPARE([$FLEX_VERSION], [2.5.33], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([You need flex 2.5.33 or greater]) ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])]) -AC_SUBST([FLEX]) -AC_CHECK_PROGS([_BASH], [bash]) +AC_CHECK_PROGS([BASH], [bash]) AC_ARG_VAR([GPERF], [perfect hash function generator]) AC_CHECK_PROGS([GPERF], [gperf]) AC_MSG_CHECKING([if gperf >= 3.0.3]) @@ -127,6 +126,7 @@ AS_CASE([$CY_EXECUTE], [1], [ #include ], [[[[WebScriptObject alloc] init];]]) ], [ + AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation]) AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config]) AS_IF([test "x$GNUSTEP_CONFIG" != x], [ AC_SUBST([CY_OBJECTIVEC]) @@ -142,5 +142,8 @@ AS_IF([test "x$CY_OBJECTIVEC" = x1], [ AS_CASE([$OTOOL], [:], [AC_MSG_WARN([Missing otool?])], [AC_SUBST([CY_OBJECTIVEC_MACH], [1])]) ]) ]) +AS_IF([test "x$GMAKE" != xmake], [ + AC_CONFIG_FILES([Makefile]) +]) AC_CONFIG_FILES([GNUmakefile]) AC_OUTPUT