From: thurston Date: Mon, 26 Jan 2009 16:54:50 +0000 (+0000) Subject: Don't need the gperf keyword seaching anymore. X-Git-Tag: 2.0_alpha~68 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83441104d00ca2055b6c02d72cd58b5cfd255701;p=external%2Fragel.git Don't need the gperf keyword seaching anymore. git-svn-id: http://svn.complang.org/ragel/trunk@668 052ea7fc-9027-0410-9066-f65837a77df0 --- diff --git a/README b/README index 7d10eb4..ea391db 100644 --- a/README +++ b/README @@ -15,7 +15,6 @@ programs: * ragel (the most recent version) * kelbt (the most recent version) - * gperf To build the user guide the following extra programs are needed: diff --git a/configure b/configure index e38dc5a..9d8139a 100755 --- a/configure +++ b/configure @@ -629,7 +629,6 @@ AR RANLIB SET_MAKE RAGEL -GPERF KELBT GDC GOBJC @@ -3231,50 +3230,6 @@ if test -z "$RAGEL"; then exit 1 fi -# Extract the first word of "gperf", so it can be a program name with args. -set dummy gperf; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GPERF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$GPERF"; then - ac_cv_prog_GPERF="$GPERF" # 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_GPERF="gperf" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -GPERF=$ac_cv_prog_GPERF -if test -n "$GPERF"; then - { echo "$as_me:$LINENO: result: $GPERF" >&5 -echo "${ECHO_T}$GPERF" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -if test -z "$GPERF"; then - echo - echo "error: gperf is required to build the parsers" - echo - exit 1 -fi - # Extract the first word of "kelbt", so it can be a program name with args. set dummy kelbt; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -4233,7 +4188,6 @@ AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim SET_MAKE!$SET_MAKE$ac_delim RAGEL!$RAGEL$ac_delim -GPERF!$GPERF$ac_delim KELBT!$KELBT$ac_delim GDC!$GDC$ac_delim GOBJC!$GOBJC$ac_delim @@ -4245,7 +4199,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index 2fb505e..b9ae491 100644 --- a/configure.in +++ b/configure.in @@ -21,9 +21,9 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA AC_INIT(ragel/main.cpp) AC_CONFIG_HEADER(ragel/config.h) -dnl Set to true if build system should generate parsers from ragel, kelbt, and -dnl gperf sources. Set to false if generated files are included and not to be -dnl built (production). +dnl Set to true if the build system should generate parsers from ragel and kelbt +dnl sources. Set to false if generated files are included and not to be built +dnl (production). AC_SUBST(BUILD_PARSERS,true) dnl Checks for programs. @@ -53,15 +53,6 @@ if test -z "$RAGEL"; then exit 1 fi -dnl Check for gperf -AC_CHECK_PROG(GPERF, gperf, gperf) -if test -z "$GPERF"; then - echo - echo "error: gperf is required to build the parsers" - echo - exit 1 -fi - dnl Check for Kelbt AC_CHECK_PROG(KELBT, kelbt, kelbt) if test -z "$KELBT"; then diff --git a/ragel/Makefile.in b/ragel/Makefile.in index 6988b20..99efc9b 100644 --- a/ragel/Makefile.in +++ b/ragel/Makefile.in @@ -43,7 +43,7 @@ CC_SRCS = \ xmlcodegen.cpp \ GEN_SRC = version.h rlscan.cpp rlparse.h rlparse.cpp \ - xmltags.cpp xmlscan.cpp xmlparse.h + xmlscan.cpp xmlparse.h LIBS = MINGW_LIBS = -lpsapi