"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
jq-1.5.tar.gz and jq-1.6.tar.gz

About: jq is a lightweight and flexible command-line JSON processor.

configure.ac  (jq-1.5):configure.ac  (jq-1.6)
m4_define([jq_version], m4_esyscmd_s([git describe --tags --dirty --match 'jq-*' |sed 's/^jq-//'])) m4_define([jq_version], [1.6])
AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues], AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues],
[jq], [https://stedolan.github.io/jq]) [jq], [https://stedolan.github.io/jq])
m4_include([m4/ax_compare_version.m4]) m4_include([m4/ax_compare_version.m4])
m4_include([m4/ax_prog_bison_version.m4]) m4_include([m4/ax_prog_bison_version.m4])
dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
AC_PREREQ([2.64]) AC_PREREQ([2.64])
AC_CONFIG_AUX_DIR([config]) AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.11.2 parallel-tests foreign -Wall]) AM_INIT_AUTOMAKE([1.11.2 subdir-objects parallel-tests foreign -Wall])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AM_PROG_AR AM_PROG_AR
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
AC_PROG_CC AC_PROG_CC
AC_PROG_CC_STDC AC_PROG_CC_STDC
AC_PROG_CPP_WERROR AC_PROG_CPP_WERROR
AC_PROG_YACC AC_PROG_YACC
AC_OBJEXT AC_OBJEXT
AC_EXEEXT AC_EXEEXT
LT_INIT([shared static win32-dll]) LT_INIT([shared static win32-dll])
skipping to change at line 40 skipping to change at line 40
if test "$USE_MAINTAINER_MODE" = yes; then if test "$USE_MAINTAINER_MODE" = yes; then
if test "$YACC" != "bison -y"; then if test "$YACC" != "bison -y"; then
AC_MSG_CHECKING([bison version]) AC_MSG_CHECKING([bison version])
AC_MSG_RESULT([not bison]) AC_MSG_RESULT([not bison])
else else
AX_PROG_BISON_VERSION([3], AX_PROG_BISON_VERSION([3],
[], [],
[AC_MSG_ERROR([You need bison version 3.0 or greater, or use --disable-mai ntainer-mode.])]) [AC_MSG_ERROR([You need bison version 3.0 or greater, or use --disable-mai ntainer-mode.])])
fi fi
AC_PROG_LEX AC_CHECK_PROGS(LEX, flex lex)
if test "x$LEX" != xflex; then
LEX="$SHELL $missing_dir/missing flex"
fi
fi
##########################################################################
# check for ONIGURUMA library
##########################################################################
AC_ARG_WITH([oniguruma],
[AS_HELP_STRING([--with-oniguruma=prefix],
[try this for a non-standard install prefix of the oniguruma library])],
[ONIGURUMAPATHSET=1],
[ONIGURUMAPATHSET=0])
if test $ONIGURUMAPATHSET = 1; then
CFLAGS="$CFLAGS -I${with_oniguruma}/include"
LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
fi
# check for ONIGURUMA library
HAVE_ONIGURUMA=0
AC_CHECK_HEADER("oniguruma.h",
AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;])
)
# handle check results
if test $HAVE_ONIGURUMA != 1; then
AC_MSG_NOTICE([Oniguruma was not found.])
AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ])
else
AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed])
fi fi
dnl Check for valgrind dnl Check for valgrind
AC_CHECK_PROGS(valgrind_cmd, valgrind) AC_CHECK_PROGS(valgrind_cmd, valgrind)
if test "x$valgrind_cmd" = "x" ; then if test "x$valgrind_cmd" = "x" ; then
AC_MSG_WARN([valgrind is required to test jq.]) AC_MSG_WARN([valgrind is required to test jq.])
fi fi
AC_CHECK_FUNCS(memmem) AC_CHECK_FUNCS(memmem)
AC_CHECK_FUNCS(mkstemp) AC_CHECK_FUNCS(mkstemp)
AC_CHECK_HEADER("shlwapi.h",[have_win32=1;])
AM_CONDITIONAL([WIN32], [test "x$have_win32" = x1])
dnl Running tests with Valgrind is slow. It is faster to iterate on dnl Running tests with Valgrind is slow. It is faster to iterate on
dnl code without Valgrind until tests pass, then enable Valgrind and dnl code without Valgrind until tests pass, then enable Valgrind and
dnl fix leaks. dnl fix leaks.
AC_ARG_ENABLE([valgrind], AC_ARG_ENABLE([valgrind],
AC_HELP_STRING([--disable-valgrind], [do not run tests under Valgrind])) AC_HELP_STRING([--disable-valgrind], [do not run tests under Valgrind]))
dnl Running tests with Valgrind is slow; address sanitizer (ASAN) is
dnl faster.
AC_ARG_ENABLE([asan],
AC_HELP_STRING([--enable-asan], [enable address sanitizer]))
dnl Undefined Behavior Sanitizer
AC_ARG_ENABLE([ubsan],
AC_HELP_STRING([--enable-ubsan], [enable undefined behavior sanitizer]))
dnl Code coverage dnl Code coverage
AC_ARG_ENABLE([gcov], AC_ARG_ENABLE([gcov],
AC_HELP_STRING([--enable-gcov], [enable gcov code coverage tool])) AC_HELP_STRING([--enable-gcov], [enable gcov code coverage tool]))
dnl Don't attempt to build docs if there's no Ruby lying around dnl Don't attempt to build docs if there's no Ruby lying around
AC_ARG_ENABLE([docs], AC_ARG_ENABLE([docs],
AC_HELP_STRING([--disable-docs], [don't build docs])) AC_HELP_STRING([--disable-docs], [don't build docs]))
dnl Don't attempt to build the error injection object (if there is no LD_PRELOAD support) dnl Don't attempt to build the error injection object (if there is no LD_PRELOAD support)
AC_ARG_ENABLE([error-injection], AC_ARG_ENABLE([error-injection],
skipping to change at line 116 skipping to change at line 97
AC_CACHE_CHECK([for Ruby dependencies], [jq_cv_ruby_deps], AC_CACHE_CHECK([for Ruby dependencies], [jq_cv_ruby_deps],
[jq_cv_ruby_deps=yes; [jq_cv_ruby_deps=yes;
AS_IF([test "x$bundle_cmd" = "x" || \ AS_IF([test "x$bundle_cmd" = "x" || \
! bmsg="`cd ${srcdir}/docs; "$bundle_cmd" check 2>/dev/null`"],[ ! bmsg="`cd ${srcdir}/docs; "$bundle_cmd" check 2>/dev/null`"],[
AC_MSG_WARN([$bmsg]) AC_MSG_WARN([$bmsg])
cat <<EOF cat <<EOF
***************************************************************** *****************************************************************
* Ruby dependencies for building jq documentation not found. * * Ruby dependencies for building jq documentation not found. *
* You can still build, install and hack on jq, but the manpage * * You can still build, install and hack on jq, but the manpage *
* will not be rebuilt and some of the tests won't run. * * will not be rebuilt and some of the tests will not run. *
* See docs/README.md for how to install the docs dependencies. * * See docs/README.md for how to install the docs dependencies. *
***************************************************************** *****************************************************************
EOF EOF
jq_cv_ruby_deps=no jq_cv_ruby_deps=no
])]) ])])
if test "x$jq_cv_ruby_deps" != "xyes"; then if test "x$jq_cv_ruby_deps" != "xyes"; then
enable_docs=no enable_docs=no
fi fi
]) ])
AM_CONDITIONAL([ENABLE_VALGRIND], [test "x$enable_valgrind" != xno]) AM_CONDITIONAL([ENABLE_VALGRIND], [test "x$enable_valgrind" != xno])
AM_CONDITIONAL([ENABLE_ASAN], [test "x$enable_asan" = xyes])
AM_CONDITIONAL([ENABLE_UBSAN], [test "x$enable_ubsan" = xyes])
AM_CONDITIONAL([ENABLE_GCOV], [test "x$enable_gcov" = xyes]) AM_CONDITIONAL([ENABLE_GCOV], [test "x$enable_gcov" = xyes])
AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" != xno]) AM_CONDITIONAL([ENABLE_DOCS], [test "x$enable_docs" != xno])
AM_CONDITIONAL([ENABLE_ERROR_INJECTION], [test "x$enable_error_injection" = xyes ]) AM_CONDITIONAL([ENABLE_ERROR_INJECTION], [test "x$enable_error_injection" = xyes ])
AM_CONDITIONAL([ENABLE_ALL_STATIC], [test "x$enable_all_static" = xyes]) AM_CONDITIONAL([ENABLE_ALL_STATIC], [test "x$enable_all_static" = xyes])
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0]) AC_FIND_FUNC([isatty], [c], [#include <unistd.h>], [0])
AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0]) AC_FIND_FUNC([_isatty], [c], [#include <io.h>], [0])
AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0]) AC_FIND_FUNC([strptime], [c], [#include <time.h>], [0, 0, 0])
AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0]) AC_FIND_FUNC([strftime], [c], [#include <time.h>], [0, 0, 0, 0])
AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0]) AC_FIND_FUNC([timegm], [c], [#include <time.h>], [0])
AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0]) AC_FIND_FUNC([gmtime_r], [c], [#include <time.h>], [0, 0])
AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0]) AC_FIND_FUNC([gmtime], [c], [#include <time.h>], [0])
AC_FIND_FUNC([localtime_r], [c], [#include <time.h>], [0, 0])
AC_FIND_FUNC([localtime], [c], [#include <time.h>], [0])
AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0]) AC_FIND_FUNC([gettimeofday], [c], [#include <time.h>], [0, 0])
AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])], AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])],
[], [[#include <time.h>]]) [], [[#include <time.h>]])
AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[De fine to 1 if the system has the __tm_gmt_off field in struct tm])], AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[De fine to 1 if the system has the __tm_gmt_off field in struct tm])],
[], [[#include <time.h>]]) [], [[#include <time.h>]])
AC_ARG_ENABLE([pthread-tls], AC_ARG_ENABLE([pthread-tls],
[AC_HELP_STRING([--enable-pthread-tls], [AC_HELP_STRING([--enable-pthread-tls],
[Enable use of pthread thread local storage])], [Enable use of pthread thread local storage])],
[], [],
[enable_pthread_tls=no]) [enable_pthread_tls=no])
if test $enable_pthread_tls = yes; then if test $enable_pthread_tls = yes; then
AC_FIND_FUNC([pthread_key_create], [pthread], [#include <pthread.h>], [NULL, NULL]) AC_FIND_FUNC([pthread_key_create], [pthread], [#include <pthread.h>], [NULL, NULL])
AC_FIND_FUNC([pthread_once], [pthread], [#include <pthread.h>], [NULL, NULL] ) AC_FIND_FUNC([pthread_once], [pthread], [#include <pthread.h>], [NULL, NULL] )
AC_FIND_FUNC([atexit], [pthread], [#include <stdlib.h>], [NULL]) AC_FIND_FUNC([atexit], [pthread], [#include <stdlib.h>], [NULL])
fi fi
dnl libm math.h functions dnl libm math.h functions
AC_CHECK_MATH_FUNC(acos, [.5]) AC_CHECK_MATH_FUNC(acos)
AC_CHECK_MATH_FUNC(acosh, [.5]) AC_CHECK_MATH_FUNC(acosh)
AC_CHECK_MATH_FUNC(asin, [.5]) AC_CHECK_MATH_FUNC(asin)
AC_CHECK_MATH_FUNC(asinh, [.5]) AC_CHECK_MATH_FUNC(asinh)
AC_CHECK_MATH_FUNC(atan, [.5]) AC_CHECK_MATH_FUNC(atan2)
AC_CHECK_MATH_FUNC(atanh, [.5]) AC_CHECK_MATH_FUNC(atan)
AC_CHECK_MATH_FUNC(cbrt, [.5]) AC_CHECK_MATH_FUNC(atanh)
AC_CHECK_MATH_FUNC(cos, [.5]) AC_CHECK_MATH_FUNC(cbrt)
AC_CHECK_MATH_FUNC(cosh, [.5]) AC_CHECK_MATH_FUNC(ceil)
AC_CHECK_MATH_FUNC(exp2, [.5]) AC_CHECK_MATH_FUNC(copysign)
AC_CHECK_MATH_FUNC(exp, [.5]) AC_CHECK_MATH_FUNC(cos)
AC_CHECK_MATH_FUNC(floor, [.5]) AC_CHECK_MATH_FUNC(cosh)
AC_CHECK_MATH_FUNC(j0, [.5]) AC_CHECK_MATH_FUNC(drem)
AC_CHECK_MATH_FUNC(j1, [.5]) AC_CHECK_MATH_FUNC(erf)
AC_CHECK_MATH_FUNC(log10, [.5]) AC_CHECK_MATH_FUNC(erfc)
AC_CHECK_MATH_FUNC(log2, [.5]) AC_CHECK_MATH_FUNC(exp10)
AC_CHECK_MATH_FUNC(log, [.5]) AC_CHECK_MATH_FUNC(exp2)
AC_CHECK_MATH_FUNC(sin, [.5]) AC_CHECK_MATH_FUNC(exp)
AC_CHECK_MATH_FUNC(sinh, [.5]) AC_CHECK_MATH_FUNC(expm1)
AC_CHECK_MATH_FUNC(sqrt, [.5]) AC_CHECK_MATH_FUNC(fabs)
AC_CHECK_MATH_FUNC(tan, [.5]) AC_CHECK_MATH_FUNC(fdim)
AC_CHECK_MATH_FUNC(tanh, [.5]) AC_CHECK_MATH_FUNC(floor)
AC_CHECK_MATH_FUNC(tgamma, [.5]) AC_CHECK_MATH_FUNC(fma)
AC_CHECK_MATH_FUNC(y0, [.5]) AC_CHECK_MATH_FUNC(fmax)
AC_CHECK_MATH_FUNC(y1, [.5]) AC_CHECK_MATH_FUNC(fmin)
AC_CHECK_MATH_FUNC(pow, [2,2]) AC_CHECK_MATH_FUNC(fmod)
AC_CHECK_MATH_FUNC(atan2, [.5,.5]) AC_CHECK_MATH_FUNC(frexp)
AC_CHECK_MATH_FUNC(hypot, [.5,.5]) AC_CHECK_MATH_FUNC(gamma)
AC_CHECK_MATH_FUNC(remainder, [3,2]) AC_CHECK_MATH_FUNC(hypot)
AC_CHECK_MATH_FUNC(j0)
AC_CHECK_MATH_FUNC(j1)
AC_CHECK_MATH_FUNC(jn)
AC_CHECK_MATH_FUNC(ldexp)
AC_CHECK_MATH_FUNC(lgamma)
AC_CHECK_MATH_FUNC(log10)
AC_CHECK_MATH_FUNC(log1p)
AC_CHECK_MATH_FUNC(log2)
AC_CHECK_MATH_FUNC(log)
AC_CHECK_MATH_FUNC(logb)
AC_CHECK_MATH_FUNC(modf)
AC_CHECK_MATH_FUNC(lgamma_r)
AC_CHECK_MATH_FUNC(nearbyint)
AC_CHECK_MATH_FUNC(nextafter)
AC_CHECK_MATH_FUNC(nexttoward)
AC_CHECK_MATH_FUNC(pow10) # Not available with glibc version >= 2.27
AC_CHECK_MATH_FUNC(pow)
AC_CHECK_MATH_FUNC(remainder)
AC_CHECK_MATH_FUNC(rint)
AC_CHECK_MATH_FUNC(round)
AC_CHECK_MATH_FUNC(scalb)
AC_CHECK_MATH_FUNC(scalbln)
AC_CHECK_MATH_FUNC(significand)
AC_CHECK_MATH_FUNC(sin)
AC_CHECK_MATH_FUNC(sinh)
AC_CHECK_MATH_FUNC(sqrt)
AC_CHECK_MATH_FUNC(tan)
AC_CHECK_MATH_FUNC(tanh)
AC_CHECK_MATH_FUNC(tgamma)
AC_CHECK_MATH_FUNC(trunc)
AC_CHECK_MATH_FUNC(y0)
AC_CHECK_MATH_FUNC(y1)
AC_CHECK_MATH_FUNC(yn)
dnl Thread local storage dnl Thread local storage
have___thread=no have___thread=no
AC_MSG_CHECKING(for thread-local storage) AC_MSG_CHECKING(for thread-local storage)
AC_LINK_IFELSE([AC_LANG_SOURCE([ AC_LINK_IFELSE([AC_LANG_SOURCE([
static __thread int x ; static __thread int x ;
int main () { x = 123; return x; } int main () { x = 123; return x; }
])], have___thread=yes) ])], have___thread=yes)
if test $have___thread = yes; then if test $have___thread = yes; then
AC_DEFINE([HAVE___THREAD],1,[Define to 1 if the system supports __thread]) AC_DEFINE([HAVE___THREAD],1,[Define to 1 if the system supports __thread])
fi fi
AC_MSG_RESULT($have___thread) AC_MSG_RESULT($have___thread)
AC_C_BIGENDIAN( AC_C_BIGENDIAN(
AC_DEFINE([IEEE_MC68k], 1, [machine is bigendian]), AC_DEFINE([IEEE_MC68k], 1, [machine is bigendian]),
AC_DEFINE([IEEE_8087], 1, [machine is littleendian]), AC_DEFINE([IEEE_8087], 1, [machine is littleendian]),
AC_MSG_ERROR(unknown endianess), AC_MSG_ERROR(unknown endianess),
AC_MSG_ERROR(universial endianess not supported) AC_MSG_ERROR(universial endianess not supported)
) )
dnl Oniguruma
AC_ARG_WITH([oniguruma],
[AS_HELP_STRING([--with-oniguruma=prefix],
[try this for a non-standard install prefix of the oniguruma library])], ,
[with_oniguruma=yes])
onig_CFLAGS=
onig_LDFLAGS=
build_oniguruma=no
AS_IF([test "x$with_oniguruma" != xno], [
save_CFLAGS="$CFLAGS"
save_LDFLAGS="$LDFLAGS"
AS_IF([test "x$with_oniguruma" != xyes], [
AS_IF([test "x$with_oniguruma" = xbuiltin], [
build_oniguruma=yes
], [
onig_CFLAGS="-I${with_oniguruma}/include"
onig_LDFLAGS="-L${with_oniguruma}/lib"
])
])
AS_IF([test "x$build_oniguruma" = xno], [
# check for ONIGURUMA library, either in /usr or where requested
CFLAGS="$CFLAGS $onig_CFLAGS"
LDFLAGS="$LDFLAGS $onig_LDFLAGS"
AC_CHECK_HEADER("oniguruma.h",
AC_CHECK_LIB([onig],[onig_version]))
# handle check results
AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
build_oniguruma=yes
AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged onigurum
a.])
])
])
AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/con
figure.ac" ], [
onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
AC_CONFIG_SUBDIRS([modules/oniguruma])
AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
])
CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS"
])
AC_SUBST(onig_CFLAGS)
AC_SUBST(onig_LDFLAGS)
AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
AC_SUBST([BUNDLER], ["$bundle_cmd"]) AC_SUBST([BUNDLER], ["$bundle_cmd"])
AC_CONFIG_MACRO_DIR([config/m4]) AC_CONFIG_MACRO_DIR([config/m4])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT
 End of changes. 10 change blocks. 
65 lines changed or deleted 129 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)