diff options
-rw-r--r-- | configure.ac | 61 | ||||
-rw-r--r-- | m4/ax_compare_version.m4 | 177 | ||||
-rw-r--r-- | m4/ax_prog_bison_version.m4 | 68 |
3 files changed, 266 insertions, 40 deletions
diff --git a/configure.ac b/configure.ac index fd4d00c9..885482c5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,9 @@ m4_define([jq_version], m4_esyscmd_s([git describe --tags --dirty --match 'jq-*' AC_INIT([jq], [jq_version], [mu@netsoc.tcd.ie], [jq], [http://stedolan.github.com/jq/]) +m4_include([m4/ax_compare_version.m4]) +m4_include([m4/ax_prog_bison_version.m4]) + dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 AC_PREREQ([2.61]) AC_CONFIG_AUX_DIR([config]) @@ -18,18 +21,25 @@ AC_EXEEXT LT_INIT([shared static win32-dll]) AM_PROG_CC_C_O + dnl couldn't use AM_PROG_LEX as it doesn't support header files like the dnl AC_PROG_YACC macros... dnl check bison version -AC_MSG_CHECKING([bison version]) + if test "$YACC" != "bison -y"; then + AC_MSG_CHECKING([bison version]) AC_MSG_RESULT([not bison]) -elif $YACC --help | grep -- --warnings >/dev/null; then - AC_MSG_RESULT([ok]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need bison version 2.5 or more recent.]) +else + AX_PROG_BISON_VERSION([3], + [], + [AC_MSG_ERROR([You need bison version 3.0 or greater.])]) + dnl These gross square brackets keep autotools from eating the perl script... +# yacc_version=[$($YACC --version 2>1 | perl -pe '($_)=/([0-9]+([.][0-9]+)+)/')] +# AX_COMPARE_VERSION([$yacc_version], [gt], [3], +# [AC_MSG_RESULT([ok])], +# [AC_MSG_RESULT([no]) +# AC_MSG_ERROR([You need bison version 3.0 or greater.])]) fi dnl @@ -57,48 +67,19 @@ if test $ONIGURUMAPATHSET == 1; then LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib" fi -# store current *FLAGS and merge with AM_*FLAGS for compilation and linker check -OLD_CFLAGS=$CFLAGS; -OLD_LDFLAGS=$LDFLAGS; -CFLAGS="$AM_CFLAGS $CFLAGS" -LDFLAGS="$AM_LDFLAGS $LDFLAGS" - -# ensure the library to check for is covered by the LIBS variable -OLD_LIBS=$LIBS -LIBS="$LIBS -lonig" - -# check for ONIGURUMA library headers -AC_MSG_CHECKING([for oniguruma.h]) -# try to compile a file that includes a header of the library oniguruma -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <oniguruma.h> ])], - [AC_MSG_RESULT([yes]) - # try to link the function 'onig_free' out of library oniguruma - AC_MSG_CHECKING([for oniguruma usability]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include <oniguruma.h>]], - [[onig_free(0);]])], - [AC_MSG_RESULT([yes]) - FOUND_ONIGURUMA=1;], - [AC_MSG_RESULT([no]) - LIBS=$OLD_LIBS; dnl reset to old value since oniguruma was not found - FOUND_ONIGURUMA=0;])], - [AC_MSG_RESULT([not found]) - FOUND_ONIGURUMA=0;]) - -# reset original *FLAGS -CFLAGS=$OLD_CFLAGS -LDFLAGS=$OLD_LDFLAGS +# check for ONIGURUMA library +HAVE_ONIGURUMA=1 +AC_CHECK_HEADER("oniguruma.h", + AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;])) # handle check results -if test $FOUND_ONIGURUMA != 1; then +if test $HAVE_ONIGURUMA != 1; then AC_MSG_NOTICE([Oniguruma was not found.]) AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ]) AC_MSG_ERROR([ oniguruma is required to build jq.]) fi - - dnl Check for valgrind AC_CHECK_PROGS(valgrind_cmd, valgrind) if test "x$valgrind_cmd" = "x" ; then diff --git a/m4/ax_compare_version.m4 b/m4/ax_compare_version.m4 new file mode 100644 index 00000000..74dc0fdd --- /dev/null +++ b/m4/ax_compare_version.m4 @@ -0,0 +1,177 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/m4/ax_prog_bison_version.m4 b/m4/ax_prog_bison_version.m4 new file mode 100644 index 00000000..91652fe9 --- /dev/null +++ b/m4/ax_prog_bison_version.m4 @@ -0,0 +1,68 @@ +# =========================================================================== +# Modified from +# http://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_BISON_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that bison supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PERL is not set the macro will fail. +# +# Example: +# +# AC_PROG_YACC +# AX_PROG_BISON_VERSION([3.0.0],[ ... ],[ ... ]) +# +# This will check to make sure that the bison you have supports at least +# version 3.0.0. +# +# NOTE: This macro uses the $YACC variable to perform the check. +# AX_WITH_YACC can be used to set that variable prior to running this +# macro. The $BISON_VERSION variable will be set with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini <salvestrini@users.sourceforge.net> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_PROG_BISON_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$YACC"],[ + ax_bison_version="$1" + + AC_MSG_CHECKING([for bison version]) + changequote(<<,>>) + bison_version=`$YACC --version 2>&1 \ + | $GREP bison \ + | $SED -rn -e 's/bison .* ([0-9]+([.][0-9])+)+/\1/p'` + changequote([,]) + AC_MSG_RESULT($bison_version) + + AC_SUBST([BISON_VERSION],[$bison_version]) + + AX_COMPARE_VERSION([$ax_bison_version],[le],[$bison_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find bison]) + $3 + ]) +]) |