"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
xapian-omega-1.4.18.tar.xz and xapian-omega-1.4.19.tar.xz

About: Xapian Omega is an application built on Xapian, consisting of indexers and a CGI search frontend.

configure.ac  (xapian-omega-1.4.18.tar.xz):configure.ac  (xapian-omega-1.4.19.tar.xz)
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
m4_define([project_version], [1.4.18]) m4_define([project_version], [1.4.19])
AC_INIT([xapian-omega], project_version, [https://xapian.org/bugs]) AC_INIT([xapian-omega], project_version, [https://xapian.org/bugs])
AC_PREREQ([2.63]) AC_PREREQ([2.63])
AM_INIT_AUTOMAKE([1.11 -Wportability subdir-objects tar-ustar no-dist-gzip dist- xz]) AM_INIT_AUTOMAKE([1.11 -Wportability subdir-objects tar-ustar no-dist-gzip dist- xz])
AC_CONFIG_SRCDIR([omega.cc]) AC_CONFIG_SRCDIR([omega.cc])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
skipping to change at line 78 skipping to change at line 78
NO_INSTALL=-no-fast-install ;; NO_INSTALL=-no-fast-install ;;
*) *)
NO_INSTALL=-no-install ;; NO_INSTALL=-no-install ;;
esac esac
AC_SUBST([NO_INSTALL]) AC_SUBST([NO_INSTALL])
dnl Probe for any options needed to enable C++11 support. dnl Probe for any options needed to enable C++11 support.
AX_CXX_COMPILE_STDCXX_11 AX_CXX_COMPILE_STDCXX_11
dnl Run tests using the C++ compiler. dnl Run tests using the C++ compiler.
AC_LANG_CPLUSPLUS AC_LANG([C++])
dnl Enable large file support if possible. dnl Enable large file support if possible.
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
dnl Test if the compiler works with $1 added to CXXFLAGS; if it does, add $1 to dnl Test if the compiler works with $1 added to CXXFLAGS; if it does, add $1 to
dnl variable $2. If the test passes, also do $3; if it fails, also do $4. dnl variable $2. If the test passes, also do $3; if it fails, also do $4.
AC_DEFUN([XAPIAN_TEST_CXXFLAGS], AC_DEFUN([XAPIAN_TEST_CXXFLAGS],
[ [
XTC_save_CXXFLAGS=$CXXFLAGS XTC_save_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $1" CXXFLAGS="$CXXFLAGS $1"
AC_TRY_COMPILE([], [], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[CXXFLAGS=$XTC_save_CXXFLAGS [CXXFLAGS=$XTC_save_CXXFLAGS
$2="${$2} $1" $2="${$2} $1"
$3], $3],
[CXXFLAGS=$XTC_save_CXXFLAGS [CXXFLAGS=$XTC_save_CXXFLAGS
$4]) $4])
]) ])
dnl Check for xapian-core. dnl Check for xapian-core.
XO_LIB_XAPIAN([], [], XO_LIB_XAPIAN([], [],
[xapian-config]regexp(project_version, [xapian-config]regexp(project_version,
[^\([0-9]*\.[0-9]*[13579]\)\..*$], [-\1])) [^\([0-9]*\.[0-9]*[13579]\)\..*$], [-\1]))
XO_REQUIRE([1.4.0]) XO_REQUIRE([1.4.0])
dnl We want XAPIAN_CXXFLAGS to be used for configure tests. dnl We want XAPIAN_CXXFLAGS to be used for configure tests.
save_CXXFLAGS=$CXXFLAGS save_CXXFLAGS=$CXXFLAGS
skipping to change at line 199 skipping to change at line 199
dnl On mingw there are several dependent libraries, so AC_CHECK_LIB would dnl On mingw there are several dependent libraries, so AC_CHECK_LIB would
dnl fail - we'd have to use LT_OUTPUT and then perform the test link with dnl fail - we'd have to use LT_OUTPUT and then perform the test link with
dnl libtool, but we've checked for magic.h, so checking the library would dnl libtool, but we've checked for magic.h, so checking the library would
dnl not really gain us much - we know it is -lmagic. dnl not really gain us much - we know it is -lmagic.
MAGIC_LIBS=-lmagic MAGIC_LIBS=-lmagic
AC_SUBST([MAGIC_LIBS]) AC_SUBST([MAGIC_LIBS])
dnl See if ftime returns void (as it does on mingw) dnl See if ftime returns void (as it does on mingw)
AC_MSG_CHECKING([return type of ftime]) AC_MSG_CHECKING([return type of ftime])
if test $ac_cv_func_ftime = yes ; then if test $ac_cv_func_ftime = yes ; then
AC_TRY_COMPILE([#include <sys/timeb.h>], AC_COMPILE_IFELSE(
[struct timeb tp; int i = ftime(&tp);], [AC_LANG_PROGRAM([[#include <sys/timeb.h>]],
AC_MSG_RESULT([int]), [[struct timeb tp; int i = ftime(&tp);]])],
AC_MSG_RESULT([void]) [AC_MSG_RESULT(int)],
AC_DEFINE([FTIME_RETURNS_VOID], [1], [Define if ftime returns void])) [AC_MSG_RESULT(void)
AC_DEFINE([FTIME_RETURNS_VOID], [1], [Define if ftime returns void])])
fi fi
dnl mingw (for instance) lacks ssize_t dnl mingw (for instance) lacks ssize_t
AC_TYPE_SSIZE_T AC_TYPE_SSIZE_T
AC_TYPE_PID_T AC_TYPE_PID_T
AC_TYPE_MODE_T AC_TYPE_MODE_T
dnl Use for Unix permission checks. dnl Use for Unix permission checks.
AC_CHECK_FUNCS([getgrouplist]) AC_CHECK_FUNCS([getgrouplist])
dnl See if getgrouplist() takes gid_t * (e.g. Linux) or int * (e.g. OS X). dnl See if getgrouplist() takes gid_t * (e.g. Linux) or int * (e.g. OS X).
if test $ac_cv_func_getgrouplist = yes ; then if test $ac_cv_func_getgrouplist = yes ; then
AC_TRY_COMPILE([#include <grp.h> AC_COMPILE_IFELSE(
#include <unistd.h>], [AC_LANG_PROGRAM([[#include <grp.h>
[int g[10]; int n = 10; return getgrouplist("root", 1, g, &n) == -1;], #include <unistd.h>]],
AC_DEFINE([GETGROUPLIST_TAKES_INT_P], 1, [Define if getgrouplist takes int * [[int g[10]; int n = 10; return getgrouplist("root", 1, g, &
])) n) == -1;]])],
[AC_DEFINE([GETGROUPLIST_TAKES_INT_P], 1, [Define if getgrouplist takes int
*])],
[])
fi fi
dnl Check for lstat() (not available under mingw for example). dnl Check for lstat() (not available under mingw for example).
AC_CHECK_FUNCS(lstat) AC_CHECK_FUNCS(lstat)
dnl Add in portable replacement for mkdtemp() on platforms which lack it. dnl Add in portable replacement for mkdtemp() on platforms which lack it.
AC_CHECK_FUNCS(mkdtemp) AC_CHECK_FUNCS(mkdtemp)
AM_CONDITIONAL(NEED_MKDTEMP, [test yes != "$ac_cv_func_mkdtemp"]) AM_CONDITIONAL(NEED_MKDTEMP, [test yes != "$ac_cv_func_mkdtemp"])
dnl Add in portable replacement for strptime() on platforms which lack it. dnl Add in portable replacement for strptime() on platforms which lack it.
skipping to change at line 319 skipping to change at line 322
fi fi
fi fi
dnl Check processor endianness. dnl Check processor endianness.
AC_C_BIGENDIAN AC_C_BIGENDIAN
dnl Check for perl. Needed for outlookmsg2html script. dnl Check for perl. Needed for outlookmsg2html script.
dnl (And in maintainer-mode, also to make man pages from "--help" output, and dnl (And in maintainer-mode, also to make man pages from "--help" output, and
dnl to make the omegascript vim syntax mode.) dnl to make the omegascript vim syntax mode.)
AC_PATH_PROG(PERL, perl, []) AC_PATH_PROG(PERL, perl, [])
AC_ARG_VAR([PERL], [Perl interpreter])
test -z "$PERL" && AC_MSG_ERROR([perl is required]) test -z "$PERL" && AC_MSG_ERROR([perl is required])
if test x"$enable_documentation" = xyes; then if test x"$enable_documentation" = xyes; then
dnl Check for help2man. (Needed to make man pages from "--help" output). dnl Check for help2man. (Needed to make man pages from "--help" output).
AC_PATH_PROG(HELP2MAN, help2man, []) AC_PATH_PROG(HELP2MAN, help2man, [])
AC_ARG_VAR([HELP2MAN], [help2man man page generator])
test -z "$HELP2MAN" && AC_MSG_ERROR([help2man is required to build documentati on]) test -z "$HELP2MAN" && AC_MSG_ERROR([help2man is required to build documentati on])
dnl Check for rst2html. (Needed to make HTML from reStructuredText format) dnl Check for rst2html. (Needed to make HTML from reStructuredText format)
dnl Also look for rst2html.py, which archlinux reportedly installs it as. dnl Also look for rst2html.py, which archlinux reportedly installs it as.
AC_PATH_PROGS(RST2HTML, [rst2html rst2html.py], []) AC_PATH_PROGS(RST2HTML, [rst2html rst2html.py], [])
AC_ARG_VAR([RST2HTML], [reST to HTML convertor])
test -z "$RST2HTML" && AC_MSG_ERROR([rst2html is required to build documentati on]) test -z "$RST2HTML" && AC_MSG_ERROR([rst2html is required to build documentati on])
fi fi
pcre_runtime_installed() { pcre_runtime_installed() {
dnl Simple check to see if the problem is likely to be that we're using a dnl Simple check to see if the problem is likely to be that we're using a
dnl "packaged" pcre but only have the runtime package installed. dnl "packaged" pcre but only have the runtime package installed.
for sfx in '' 32 64 ; do for sfx in '' 32 64 ; do
set /usr/lib$sfx/libpcre*.so.* set /usr/lib$sfx/libpcre*.so.*
if test "/usr/lib$sfx/libpcre?.so.*" != "$1" ; then if test "/usr/lib$sfx/libpcre?.so.*" != "$1" ; then
if test -r /etc/debian_version ; then if test -r /etc/debian_version ; then
skipping to change at line 402 skipping to change at line 408
*__INTEL_COMPILER*__clang__*) *__INTEL_COMPILER*__clang__*)
dnl GCC (since neither substituted): dnl GCC (since neither substituted):
dnl The exact format of g++ --version seems to change with almost every dnl The exact format of g++ --version seems to change with almost every
dnl minor release so use the preprocessor macros which should be more dnl minor release so use the preprocessor macros which should be more
dnl robust. dnl robust.
AC_MSG_CHECKING([for version of $CXX]) AC_MSG_CHECKING([for version of $CXX])
gxx_version=`echo __GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__|$CXX -E -|se d '/^#/d;s/ //g'` gxx_version=`echo __GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__|$CXX -E -|se d '/^#/d;s/ //g'`
AC_MSG_RESULT([GCC $gxx_version]) AC_MSG_RESULT([GCC $gxx_version])
case $gxx_version in
[[0123]].*|4.[[0-6]].*)
AC_MSG_ERROR([Xapian requires GCC 4.7 or later])
;;
esac
dnl -Wundef was supported by g++ 3.0. dnl -Wundef was supported by g++ 3.0.
dnl dnl
dnl -Wlogical-op and -Wmissing-declarations (for C++) were added in dnl -Wlogical-op and -Wmissing-declarations (for C++) were added in
dnl GCC 4.3. dnl GCC 4.3.
dnl dnl
dnl -Wdouble-promotion was added in GCC 4.6. dnl -Wdouble-promotion was added in GCC 4.6.
dnl dnl
dnl -Winit-self was added in GCC 3.4, but for GCC < 4.7 g++ always dnl -Winit-self was added in GCC 3.4, but for GCC < 4.7 g++ always
dnl warns for this case with -Wuninitialized (implied by -W). We dnl warns for this case with -Wuninitialized (implied by -W). We
dnl don't intend to use this idiom, so any instances are bugs we'd dnl don't intend to use this idiom, so any instances are bugs we'd
dnl like to know about. dnl like to know about.
dnl dnl
dnl All the other options were supported by g++ 2.95. dnl All the other options were supported by g++ 2.95.
AM_CXXFLAGS="$AM_CXXFLAGS -Wall -W -Wredundant-decls -Wpointer-arith -Wcas t-qual -Wcast-align -Wformat-security -fno-gnu-keywords -Wundef -Woverloaded-vir tual -Wstrict-null-sentinel -Wshadow -Wstrict-overflow=1 -Wlogical-op -Wmissing- declarations -Wdouble-promotion -Winit-self" AM_CXXFLAGS="$AM_CXXFLAGS -Wall -W -Wredundant-decls -Wpointer-arith -Wcas t-qual -Wcast-align -Wformat-security -fno-gnu-keywords -Wundef -Woverloaded-vir tual -Wstrict-null-sentinel -Wshadow -Wstrict-overflow=1 -Wlogical-op -Wmissing- declarations -Wdouble-promotion -Winit-self"
case $gxx_version in
[[0123]].*|4.[[0-6]].*)
AC_MSG_ERROR([Xapian requires GCC 4.7 or later])
;;
4.*|5.*)
;;
6.*)
AM_CXXFLAGS="$AM_CXXFLAGS -Wduplicated-cond"
;;
*)
AM_CXXFLAGS="$AM_CXXFLAGS -Wduplicated-cond -Wduplicated-branches"
;;
esac
dnl FIXME: dnl FIXME:
dnl -Wold-style-cast is interesting, but triggers for macros from dnl -Wold-style-cast is interesting, but triggers for macros from
dnl system headers (e.g. FD_SET). GCC 4.8 improved this by making dnl system headers (e.g. FD_SET). GCC 4.8 improved this by making
dnl -ftrack-macro-expansion=2 the default, but we still see such dnl -ftrack-macro-expansion=2 the default, but we still see such
dnl warnings on some platforms for some reason (e.g. Cygwin with GCC dnl warnings on some platforms for some reason (e.g. Cygwin with GCC
dnl 5.4.0 warns about FD_SET, and on Debian with GCC 4.9.2 we see dnl 5.4.0 warns about FD_SET, and on Debian with GCC 4.9.2 we see
dnl warnings from zlib.h). dnl warnings from zlib.h).
dnl Automatically add -Werror if maintainer mode is enabled. dnl Automatically add -Werror if maintainer mode is enabled.
if test x$USE_MAINTAINER_MODE = xyes; then if test x$USE_MAINTAINER_MODE = xyes; then
skipping to change at line 501 skipping to change at line 515
;; ;;
esac esac
fi fi
AH_BOTTOM( AH_BOTTOM(
[/* Disable stupid MSVC "performance" warning for converting int to bool. */ [/* Disable stupid MSVC "performance" warning for converting int to bool. */
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(disable:4800) # pragma warning(disable:4800)
#endif #endif
/* _FORTIFY_SOURCE is only supported by GCC >= 4.1 and glibc >= 2.3.4, but it /* Default to enabling _FORTIFY_SOURCE at level 2. It shouldn't cause a
* shouldn't cause a problem to define it where it's not supported and some * problem to define it where it's not supported.
* distros may have backported support, so hardcoding version checks is
* counter-productive.
* *
* Check if _FORTIFY_SOURCE is already defined to allow the user to override * Check if _FORTIFY_SOURCE is already defined to allow the user to override
* our choice with "./configure CPPFLAGS=-D_FORTIFY_SOURCE=0" or "...=1". * our choice with "./configure CPPFLAGS=-D_FORTIFY_SOURCE=0" or "...=1".
*/ */
#if defined __GNUC__ && !defined _FORTIFY_SOURCE #if defined __GNUC__ && !defined _FORTIFY_SOURCE
# define _FORTIFY_SOURCE 2 # define _FORTIFY_SOURCE 2
# ifdef __MINGW32__
/* Both mingw32 and mingw-w64 define __MINGW32__. */
# include <stddef.h>
# ifdef __MINGW64_VERSION_MAJOR
/* Enabling _FORTIFY_SOURCE on newer mingw-w64 requires linking with -lssp so
* we simply don't automatically enable it there.
*/
# undef _FORTIFY_SOURCE
# endif
# endif
#endif #endif
/* For GCC >= 3.0 (and Intel's C++ compiler, which also defines __GNUC__), /* For GCC >= 3.0 (and Intel's C++ compiler, which also defines __GNUC__),
* we can use __builtin_expect to give the compiler hints about branch * we can use __builtin_expect to give the compiler hints about branch
* prediction. See HACKING for how to use these. * prediction. See HACKING for how to use these.
*/ */
#if defined __GNUC__ #if defined __GNUC__
/* The arguments of __builtin_expect() are both long, so use !! to ensure that /* The arguments of __builtin_expect() are both long, so use !! to ensure that
* the first argument is always an integer expression, and always 0 or 1, but * the first argument is always an integer expression, and always 0 or 1, but
* still has the same truth value for the if or while it is used in. * still has the same truth value for the if or while it is used in.
 End of changes. 12 change blocks. 
28 lines changed or deleted 51 lines changed or added

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