Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 39204 Details for
Bug 19192
spamprobe (new ebuild)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated Patch (again)
spamprobe-0.9h-db4.patch (text/plain), 26.14 KB, created by
zhcnmccmzhdvfevooo
on 2004-09-08 08:08:27 UTC
(
hide
)
Description:
Updated Patch (again)
Filename:
MIME Type:
Creator:
zhcnmccmzhdvfevooo
Created:
2004-09-08 08:08:27 UTC
Size:
26.14 KB
patch
obsolete
>--- ../spamprobe-0.9h.orig/configure.in 2004-02-02 19:09:43.000000000 +0100 >+++ configure.in 2004-09-08 16:15:10.899652152 +0200 >@@ -68,25 +68,25 @@ > [ > AC_EGREP_HEADER([DB_VERSION_MAJOR *3|4], [db.h],, > AC_MSG_ERROR([No suitable BerkeleyDB db.h header file found. >- Use --with-db=PATH to specify the path to a version 3 or later install directory. >+ Use --with-db=PATH to specify the path to a version 3 or later install header directory. > You can download BerkeleyDB from http://www.sleepycat.com]) > ) > ] > ) >- AC_TRY_LINK_FUNC(db_create,, >- AC_CHECK_LIB(db-4, db_create, LIBS="$LIBS -ldb-4", >- AC_CHECK_LIB(db-3, db_create, LIBS="$LIBS -ldb-3", >- AC_CHECK_LIB(db-2, db_create, LIBS="$LIBS -ldb-2", >- AC_CHECK_LIB(db, db_create, LIBS="$LIBS -ldb", >- AC_CHECK_LIB(db3, db_create, LIBS="$LIBS -ldb3", >- AC_CHECK_LIB(db-3.1, db_create, LIBS="$LIBS -ldb-3.1", >- AC_CHECK_LIB(db4, db_create, LIBS="$LIBS -ldb4", >- AC_MSG_ERROR([No suitable BerkeleyDB library found. >- Use --with-db=PATH to specify the path to a version 3 or later install directory. >- You can download BerkeleyDB from http://www.sleepycat.com]))))))))) >- AC_MSG_CHECKING(BerkeleyDB) >- AC_TRY_LINK_FUNC(db_create, AC_DEFINE([USE_DB]) have_database=1) >- AC_MSG_RESULT(ok) >+ >+ AX_PATH_BDB([3],[ >+ LIBS="$BDB_LIBS $LIBS" >+ LDFLAGS="$BDB_LDFLAGS $LDFLAGS" >+ CPPFLAGS="$BDB_CPPFLAGS $CPPFLAGS" >+ AC_TRY_LINK_FUNC(db_create, AC_DEFINE([USE_DB]) have_database=1) >+ AC_TRY_LINK_FUNC(db_create_4000, AC_DEFINE([USE_DB]) have_database=1) >+ AC_TRY_LINK_FUNC(db_create_4001, AC_DEFINE([USE_DB]) have_database=1) >+ AC_TRY_LINK_FUNC(db_create_4002, AC_DEFINE([USE_DB]) have_database=1) >+ ],[ >+ AC_MSG_ERROR([No suitable BerkeleyDB db.h header file found. >+ Use --with-db=PATH to specify the path to a version 3 or later install header directory. >+ You can download BerkeleyDB from http://www.sleepycat.com]) >+ ]) > fi > > if test $have_database = 0 ; then >--- ../spamprobe-0.9h.orig/acinclude.m4 2004-09-08 15:59:02.428882088 +0200 >+++ acinclude.m4 2004-09-08 16:24:50.970467984 +0200 >@@ -0,0 +1,658 @@ >+# >+# Makros from http://ac-archive.sourceforge.net >+# These makros should be used while the ac-archive ebuild is still >+# masked in Portage >+# >+# Used makros: >+# - ax_path_bdb v1.1 >+# - ax_compare_versio v1.1 >+# >+# The Makros are under this License: >+# Every Autoconf macro presented on this web site is free software; >+# you can redistribute it and/or modify it under the terms of the >+# GNU General Public License as published by the Free Software >+# Foundation; either version 2, or (at your option) any later version. >+# >+# They are distributed in the hope that they will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. (You should have >+# received a copy of the GNU General Public License along with this >+# program; if not, write to the Free Software Foundation, Inc., >+# 59 Temple Place -- Suite 330, Boston, MA 02111-1307, USA.) >+# >+# As a special exception, the Free Software Foundation gives >+# unlimited permission to copy, distribute and modify the configure >+# scripts that are the output of Autoconf. You need not follow the >+# terms of the GNU General Public License when using or distributing >+# such scripts, even though portions of the text of Autoconf appear >+# in them. The GNU General Public License (GPL) does govern all other >+# use of the material that constitutes the Autoconf program. >+# >+# Certain portions of the Autoconf source text are designed to be >+# copied (in certain cases, depending on the input) into the output >+# of Autoconf. We call these the "data" portions. The rest of the >+# Autoconf source text consists of comments plus executable code that >+# decides which of the data portions to output in any given case. We >+# call these comments and executable code the "non-data" portions. >+# Autoconf never copies any of the non-data portions into its output. >+# >+# This special exception to the GPL applies to versions of Autoconf >+# released by the Free Software Foundation. When you make and distribute >+# a modified version of Autoconf, you may extend this special exception >+# to the GPL to apply to your modified version as well, *unless* your >+# modified version has the potential to copy into its output some of the >+# text that was the non-data portion of the version that you started >+# with. (In other words, unless your change moves or copies text from >+# the non-data portions to the data portions.) If your modification has >+# such potential, you must delete any notice of this special exception >+# to the GPL from your modified version. >+# >+# >+ >+ >+dnl ######################################################################### >+AC_DEFUN([AX_COMPARE_VERSION], [ >+ # 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 >+ >+ >+dnl ######################################################################### >+AC_DEFUN([AX_PATH_BDB], [ >+ dnl # Used to indicate success or failure of this function. >+ ax_path_bdb_ok=no >+ >+ # Add --with-bdb-dir option to configure. >+ AC_ARG_WITH([bdb-dir], >+ [AC_HELP_STRING([--with-bdb-dir=DIR], >+ [Berkeley DB installation directory])]) >+ >+ # Check if --with-bdb-dir was specified. >+ if test "x$with_bdb_dir" = "x" ; then >+ # No option specified, so just search the system. >+ AX_PATH_BDB_NO_OPTIONS([$1], [HIGHEST], [ >+ ax_path_bdb_ok=yes >+ ]) >+ else >+ # Set --with-bdb-dir option. >+ ax_path_bdb_INC="$with_bdb_dir/include" >+ ax_path_bdb_LIB="$with_bdb_dir/lib" >+ >+ dnl # Save previous environment, and modify with new stuff. >+ ax_path_bdb_save_CPPFLAGS="$CPPFLAGS" >+ CPPFLAGS="-I$ax_path_bdb_INC $CPPFLAGS" >+ >+ ax_path_bdb_save_LDFLAGS=$LDFLAGS >+ LDFLAGS="-L$ax_path_bdb_LIB $LDFLAGS" >+ >+ # Check for specific header file db.h >+ AC_MSG_CHECKING([db.h presence in $ax_path_bdb_INC]) >+ if test -f "$ax_path_bdb_INC/db.h" ; then >+ AC_MSG_RESULT([yes]) >+ # Check for library >+ AX_PATH_BDB_NO_OPTIONS([$1], [ENVONLY], [ >+ ax_path_bdb_ok=yes >+ BDB_CPPFLAGS="-I$ax_path_bdb_INC" >+ BDB_LDFLAGS="-L$ax_path_bdb_LIB" >+ ]) >+ else >+ AC_MSG_RESULT([no]) >+ AC_MSG_NOTICE([no usable Berkeley DB not found]) >+ fi >+ >+ dnl # Restore the environment. >+ CPPFLAGS="$ax_path_bdb_save_CPPFLAGS" >+ LDFLAGS="$ax_path_bdb_save_LDFLAGS" >+ >+ fi >+ >+ dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. >+ if test "$ax_path_bdb_ok" = "yes" ; then >+ m4_ifvaln([$2],[$2],[:])dnl >+ m4_ifvaln([$3],[else $3])dnl >+ fi >+ >+]) dnl AX_PATH_BDB >+ >+dnl ######################################################################### >+dnl Check for berkeley DB of at least MINIMUM-VERSION on system. >+dnl >+dnl The OPTION argument determines how the checks occur, and can be one of: >+dnl >+dnl HIGHEST - Check both the environment and the default installation >+dnl directories for Berkeley DB and choose the version that >+dnl is highest. (default) >+dnl ENVFIRST - Check the environment first, and if no satisfactory >+dnl library is found there check the default installation >+dnl directories for Berkeley DB which is /usr/local/BerkeleyDB* >+dnl ENVONLY - Check the current environment only. >+dnl >+dnl Requires AX_PATH_BDB_PATH_GET_VERSION, AX_PATH_BDB_PATH_FIND_HIGHEST, >+dnl AX_PATH_BDB_ENV_CONFIRM_LIB, AX_PATH_BDB_ENV_GET_VERSION, and >+dnl AX_COMPARE_VERSION macros. >+dnl >+dnl Result: sets ax_path_bdb_no_options_ok to yes or no >+dnl sets BDB_LIBS, BDB_CPPFLAGS, BDB_LDFLAGS, BDB_VERSION >+dnl >+dnl AX_PATH_BDB_NO_OPTIONS([MINIMUM-VERSION], [OPTION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) >+AC_DEFUN([AX_PATH_BDB_NO_OPTIONS], [ >+ dnl # Used to indicate success or failure of this function. >+ ax_path_bdb_no_options_ok=no >+ >+ # Values to add to environment to use Berkeley DB. >+ BDB_VERSION='' >+ BDB_LIBS='' >+ BDB_CPPFLAGS='' >+ BDB_LDFLAGS='' >+ >+ # Check cross compilation here. >+ if test "x$cross_compiling" = "xyes" ; then >+ # If cross compiling, can't use AC_RUN_IFELSE so do these tests. >+ # The AC_PREPROC_IFELSE confirms that db.h is preprocessable, >+ # and extracts the version number from it. >+ AC_MSG_CHECKING([for db.h]) >+ >+ AS_VAR_PUSHDEF([HEADER_VERSION],[ax_path_bdb_no_options_HEADER_VERSION])dnl >+ HEADER_VERSION='' >+ AC_PREPROC_IFELSE([ >+ AC_LANG_SOURCE([[ >+#include <db.h> >+AX_PATH_BDB_STUFF DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH >+ ]]) >+ ],[ >+ # Extract version from preprocessor output. >+ HEADER_VERSION=`eval "$ac_cpp conftest.$ac_ext" 2> /dev/null \ >+ | grep AX_PATH_BDB_STUFF | sed 's/[[^0-9,]]//g;s/,/./g;1q'` >+ ],[]) >+ >+ if test "x$HEADER_VERSION" = "x" ; then >+ AC_MSG_RESULT([no]) >+ else >+ AC_MSG_RESULT([$HEADER_VERSION]) >+ >+ # Check that version is high enough. >+ AX_COMPARE_VERSION([$HEADER_VERSION],[ge],[$1],[ >+ # get major and minor version numbers >+ AS_VAR_PUSHDEF([MAJ],[ax_path_bdb_no_options_MAJOR])dnl >+ MAJ=`echo $HEADER_VERSION | sed 's,\..*,,'` >+ AS_VAR_PUSHDEF([MIN],[ax_path_bdb_no_options_MINOR])dnl >+ MIN=`echo $HEADER_VERSION | sed 's,^[[0-9]]*\.,,;s,\.[[0-9]]*$,,'` >+ >+ dnl # Save LIBS. >+ ax_path_bdb_no_options_save_LIBS="$LIBS" >+ >+ # Check that we can link with the library. >+ AC_SEARCH_LIBS([db_version], >+ [db db-$MAJ.$MIN db$MAJ.$MIN db$MAJ$MIN db-$MAJ db$MAJ],[ >+ # Sucessfully found library. >+ ax_path_bdb_no_options_ok=yes >+ BDB_VERSION=$HEADER_VERSION >+ >+ # Extract library from LIBS >+ ax_path_bdb_no_options_LEN=` \ >+ echo "x$ax_path_bdb_no_options_save_LIBS" \ >+ | awk '{print(length)}'` >+ BDB_LIBS=`echo "x$LIBS " \ >+ | sed "s/.\{$ax_path_bdb_no_options_LEN\}\$//;s/^x//;s/ //g"` >+ ],[]) >+ >+ dnl # Restore LIBS >+ LIBS="$ax_path_bdb_no_options_save_LIBS" >+ >+ AS_VAR_POPDEF([MAJ])dnl >+ AS_VAR_POPDEF([MIN])dnl >+ ]) >+ fi >+ >+ AS_VAR_POPDEF([HEADER_VERSION])dnl >+ else >+ # Not cross compiling. >+ # Check version of Berkeley DB in the current environment. >+ AX_PATH_BDB_ENV_GET_VERSION([ >+ AX_COMPARE_VERSION([$ax_path_bdb_env_get_version_VERSION],[ge],[$1],[ >+ # Found acceptable version in current environment. >+ ax_path_bdb_no_options_ok=yes >+ BDB_VERSION="$ax_path_bdb_env_get_version_VERSION" >+ BDB_LIBS="$ax_path_bdb_env_get_version_LIBS" >+ ]) >+ ]) >+ >+ # Determine if we need to search /usr/local/BerkeleyDB* >+ ax_path_bdb_no_options_DONE=no >+ if test "x$2" = "xENVONLY" ; then >+ ax_path_bdb_no_options_DONE=yes >+ elif test "x$2" = "xENVFIRST" ; then >+ ax_path_bdb_no_options_DONE=$ax_path_bdb_no_options_ok >+ fi >+ >+ if test "$ax_path_bdb_no_options_DONE" = "no" ; then >+ # Check for highest in /usr/local/BerkeleyDB* >+ AX_PATH_BDB_PATH_FIND_HIGHEST([ >+ if test "$ax_path_bdb_no_options_ok" = "yes" ; then >+ # If we already have an acceptable version use this if higher. >+ AX_COMPARE_VERSION( >+ [$ax_path_bdb_path_find_highest_VERSION],[gt],[$BDB_VERSION]) >+ else >+ # Since we didn't have an acceptable version check if this one is. >+ AX_COMPARE_VERSION( >+ [$ax_path_bdb_path_find_highest_VERSION],[ge],[$1]) >+ fi >+ ]) >+ >+ dnl # If result from _AX_COMPARE_VERSION is true we want this version. >+ if test "$ax_compare_version" = "true" ; then >+ ax_path_bdb_no_options_ok=yes >+ BDB_LIBS="-ldb" >+ BDB_CPPFLAGS="-I$ax_path_bdb_path_find_highest_DIR/include" >+ BDB_LDFLAGS="-L$ax_path_bdb_path_find_highest_DIR/lib" >+ BDB_VERSION="$ax_path_bdb_path_find_highest_VERSION" >+ fi >+ fi >+ fi >+ >+ dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. >+ if test "$ax_path_bdb_no_options_ok" = "yes" ; then >+ AC_MSG_NOTICE([using Berkeley DB version $BDB_VERSION]) >+ AC_DEFINE([HAVE_DB_H],[1], >+ [Define to 1 if you have the <db.h> header file.]) >+ m4_ifvaln([$3],[$3])dnl >+ else >+ AC_MSG_NOTICE([no Berkeley DB version $1 or higher found]) >+ m4_ifvaln([$4],[$4])dnl >+ fi >+]) dnl AX_PATH_BDB_NO_OPTIONS >+ >+dnl ######################################################################### >+dnl Check the default installation directory for Berkeley DB which is >+dnl of the form /usr/local/BerkeleyDB* for the highest version. >+dnl >+dnl Result: sets ax_path_bdb_path_find_highest_ok to yes or no, >+dnl sets ax_path_bdb_path_find_highest_VERSION to version, >+dnl sets ax_path_bdb_path_find_highest_DIR to directory. >+dnl >+dnl AX_PATH_BDB_PATH_FIND_HIGHEST([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) >+AC_DEFUN([AX_PATH_BDB_PATH_FIND_HIGHEST], [ >+ dnl # Used to indicate success or failure of this function. >+ ax_path_bdb_path_find_highest_ok=no >+ >+ AS_VAR_PUSHDEF([VERSION],[ax_path_bdb_path_find_highest_VERSION])dnl >+ VERSION='' >+ >+ ax_path_bdb_path_find_highest_DIR='' >+ >+ # find highest verison in default install directory for Berkeley DB >+ AS_VAR_PUSHDEF([CURDIR],[ax_path_bdb_path_find_highest_CURDIR])dnl >+ AS_VAR_PUSHDEF([CUR_VERSION],[ax_path_bdb_path_get_version_VERSION])dnl >+ >+ for CURDIR in `ls -d /usr/local/BerkeleyDB* 2> /dev/null` >+ do >+ AX_PATH_BDB_PATH_GET_VERSION([$CURDIR],[ >+ AX_COMPARE_VERSION([$CUR_VERSION],[gt],[$VERSION],[ >+ ax_path_bdb_path_find_highest_ok=yes >+ ax_path_bdb_path_find_highest_DIR="$CURDIR" >+ VERSION="$CUR_VERSION" >+ ]) >+ ]) >+ done >+ >+ AS_VAR_POPDEF([VERSION])dnl >+ AS_VAR_POPDEF([CUR_VERSION])dnl >+ AS_VAR_POPDEF([CURDIR])dnl >+ >+ dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. >+ if test "$ax_path_bdb_path_find_highest_ok" = "yes" ; then >+ m4_ifvaln([$1],[$1],[:])dnl >+ m4_ifvaln([$2],[else $2])dnl >+ fi >+ >+]) dnl AX_PATH_BDB_PATH_FIND_HIGHEST >+ >+dnl ######################################################################### >+dnl Checks for Berkeley DB in specified directory's lib and include >+dnl subdirectories. >+dnl >+dnl Result: sets ax_path_bdb_path_get_version_ok to yes or no, >+dnl sets ax_path_bdb_path_get_version_VERSION to version. >+dnl >+dnl AX_PATH_BDB_PATH_GET_VERSION(BDB-DIR, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) >+AC_DEFUN([AX_PATH_BDB_PATH_GET_VERSION], [ >+ dnl # Used to indicate success or failure of this function. >+ ax_path_bdb_path_get_version_ok=no >+ >+ # Indicate status of checking for Berkeley DB header. >+ AC_MSG_CHECKING([in $1/include for db.h]) >+ ax_path_bdb_path_get_version_got_header=no >+ test -f "$1/include/db.h" && ax_path_bdb_path_get_version_got_header=yes >+ AC_MSG_RESULT([$ax_path_bdb_path_get_version_got_header]) >+ >+ # Indicate status of checking for Berkeley DB library. >+ AC_MSG_CHECKING([in $1/lib for library -ldb]) >+ >+ ax_path_bdb_path_get_version_VERSION='' >+ >+ if test -d "$1/include" && test -d "$1/lib" && >+ test "$ax_path_bdb_path_get_version_got_header" = "yes" ; then >+ dnl # save and modify environment >+ ax_path_bdb_path_get_version_save_CPPFLAGS="$CPPFLAGS" >+ CPPFLAGS="-I$1/include $CPPFLAGS" >+ >+ ax_path_bdb_path_get_version_save_LIBS="$LIBS" >+ LIBS="$LIBS -ldb" >+ >+ ax_path_bdb_path_get_version_save_LDFLAGS="$LDFLAGS" >+ LDFLAGS="-L$1/lib $LDFLAGS" >+ >+ # Compile and run a program that compares the version defined in >+ # the header file with a version defined in the library function >+ # db_version. >+ AC_RUN_IFELSE([ >+ AC_LANG_SOURCE([[ >+#include <stdio.h> >+#include <db.h> >+int main(int argc,char **argv) >+{ >+ int major,minor,patch; >+ db_version(&major,&minor,&patch); >+ if (argc > 1) >+ printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); >+ if (DB_VERSION_MAJOR == major && DB_VERSION_MINOR == minor && >+ DB_VERSION_PATCH == patch) >+ return 0; >+ else >+ return 1; >+} >+ ]]) >+ ],[ >+ # Program compiled and ran, so get version by adding argument. >+ ax_path_bdb_path_get_version_VERSION=`./conftest$ac_exeext x` >+ ax_path_bdb_path_get_version_ok=yes >+ ],[],[]) >+ >+ dnl # restore environment >+ CPPFLAGS="$ax_path_bdb_path_get_version_save_CPPFLAGS" >+ LIBS="$ax_path_bdb_path_get_version_save_LIBS" >+ LDFLAGS="$ax_path_bdb_path_get_version_save_LDFLAGS" >+ fi >+ >+ dnl # Finally, execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. >+ if test "$ax_path_bdb_path_get_version_ok" = "yes" ; then >+ AC_MSG_RESULT([$ax_path_bdb_path_get_version_VERSION]) >+ m4_ifvaln([$2],[$2])dnl >+ else >+ AC_MSG_RESULT([no]) >+ m4_ifvaln([$3],[$3])dnl >+ fi >+]) dnl AX_PATH_BDB_PATH_GET_VERSION >+ >+############################################################################# >+dnl Checks if version of library and header match specified version. >+dnl Only meant to be used by AX_PATH_BDB_ENV_GET_VERSION macro. >+dnl >+dnl Requires AX_COMPARE_VERSION macro. >+dnl >+dnl Result: sets ax_path_bdb_env_confirm_lib_ok to yes or no. >+dnl >+dnl AX_PATH_BDB_ENV_CONFIRM_LIB(VERSION, [LIBNAME]) >+AC_DEFUN([AX_PATH_BDB_ENV_CONFIRM_LIB], [ >+ dnl # Used to indicate success or failure of this function. >+ ax_path_bdb_env_confirm_lib_ok=no >+ >+ dnl # save and modify environment to link with library LIBNAME >+ ax_path_bdb_env_confirm_lib_save_LIBS="$LIBS" >+ LIBS="$LIBS $2" >+ >+ # Compile and run a program that compares the version defined in >+ # the header file with a version defined in the library function >+ # db_version. >+ AC_RUN_IFELSE([ >+ AC_LANG_SOURCE([[ >+#include <stdio.h> >+#include <db.h> >+int main(int argc,char **argv) >+{ >+ int major,minor,patch; >+ db_version(&major,&minor,&patch); >+ if (argc > 1) >+ printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); >+ if (DB_VERSION_MAJOR == major && DB_VERSION_MINOR == minor && >+ DB_VERSION_PATCH == patch) >+ return 0; >+ else >+ return 1; >+} >+ ]]) >+ ],[ >+ # Program compiled and ran, so get version by giving an argument, >+ # which will tell the program to print the output. >+ ax_path_bdb_env_confirm_lib_VERSION=`./conftest$ac_exeext x` >+ >+ # If the versions all match up, indicate success. >+ AX_COMPARE_VERSION([$ax_path_bdb_env_confirm_lib_VERSION],[eq],[$1],[ >+ ax_path_bdb_env_confirm_lib_ok=yes >+ ]) >+ ],[],[]) >+ >+ dnl # restore environment >+ LIBS="$ax_path_bdb_env_confirm_lib_save_LIBS" >+ >+]) dnl AX_PATH_BDB_ENV_CONFIRM_LIB >+ >+############################################################################# >+dnl Finds the version and library name for Berkeley DB in the >+dnl current environment. Tries many different names for library. >+dnl >+dnl Requires AX_PATH_BDB_ENV_CONFIRM_LIB macro. >+dnl >+dnl Result: set ax_path_bdb_env_get_version_ok to yes or no, >+dnl set ax_path_bdb_env_get_version_VERSION to the version found, >+dnl and ax_path_bdb_env_get_version_LIBNAME to the library name. >+dnl >+dnl AX_PATH_BDB_ENV_GET_VERSION([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) >+AC_DEFUN([AX_PATH_BDB_ENV_GET_VERSION], [ >+ dnl # Used to indicate success or failure of this function. >+ ax_path_bdb_env_get_version_ok=no >+ >+ ax_path_bdb_env_get_version_VERSION='' >+ ax_path_bdb_env_get_version_LIBS='' >+ >+ AS_VAR_PUSHDEF([HEADER_VERSION],[ax_path_bdb_env_get_version_HEADER_VERSION])dnl >+ AS_VAR_PUSHDEF([TEST_LIBNAME],[ax_path_bdb_env_get_version_TEST_LIBNAME])dnl >+ >+ # Indicate status of checking for Berkeley DB library. >+ AC_MSG_CHECKING([for db.h]) >+ >+ # Compile and run a program that determines the Berkeley DB version >+ # in the header file db.h. >+ HEADER_VERSION='' >+ AC_RUN_IFELSE([ >+ AC_LANG_SOURCE([[ >+#include <stdio.h> >+#include <db.h> >+int main(int argc,char **argv) >+{ >+ if (argc > 1) >+ printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); >+ return 0; >+} >+ ]]) >+ ],[ >+ # Program compiled and ran, so get version by adding an argument. >+ HEADER_VERSION=`./conftest$ac_exeext x` >+ AC_MSG_RESULT([$HEADER_VERSION]) >+ ],[AC_MSG_RESULT([no])],[AC_MSG_RESULT([no])]) >+ >+ # Have header version, so try to find corresponding library. >+ # Looks for library names in the order: >+ # nothing, db, db-X.Y, dbX.Y, dbXY, db-X, dbX >+ # and stops when it finds the first one that matches the version >+ # of the header file. >+ if test "x$HEADER_VERSION" != "x" ; then >+ AC_MSG_CHECKING([for library containing Berkeley DB $HEADER_VERSION]) >+ >+ AS_VAR_PUSHDEF([MAJOR],[ax_path_bdb_env_get_version_MAJOR])dnl >+ AS_VAR_PUSHDEF([MINOR],[ax_path_bdb_env_get_version_MINOR])dnl >+ >+ # get major and minor version numbers >+ MAJOR=`echo $HEADER_VERSION | sed 's,\..*,,'` >+ MINOR=`echo $HEADER_VERSION | sed 's,^[[0-9]]*\.,,;s,\.[[0-9]]*$,,'` >+ >+ # see if it is already specified in LIBS >+ TEST_LIBNAME='' >+ AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) >+ >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then >+ # try format "db" >+ TEST_LIBNAME='-ldb' >+ AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) >+ fi >+ >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then >+ # try format "db-X.Y" >+ TEST_LIBNAME="-ldb-${MAJOR}.$MINOR" >+ AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) >+ fi >+ >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then >+ # try format "dbX.Y" >+ TEST_LIBNAME="-ldb${MAJOR}.$MINOR" >+ AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) >+ fi >+ >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then >+ # try format "dbXY" >+ TEST_LIBNAME="-ldb$MAJOR$MINOR" >+ AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) >+ fi >+ >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then >+ # try format "db-X" >+ TEST_LIBNAME="-ldb-$MAJOR" >+ AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) >+ fi >+ >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then >+ # try format "dbX" >+ TEST_LIBNAME="-ldb$MAJOR" >+ AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) >+ fi >+ >+ dnl # Found a valid library. >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "yes" ; then >+ if test "x$TEST_LIBNAME" = "x" ; then >+ AC_MSG_RESULT([none required]) >+ else >+ AC_MSG_RESULT([$TEST_LIBNAME]) >+ fi >+ ax_path_bdb_env_get_version_VERSION="$HEADER_VERSION" >+ ax_path_bdb_env_get_version_LIBS="$TEST_LIBNAME" >+ ax_path_bdb_env_get_version_ok=yes >+ else >+ AC_MSG_RESULT([no]) >+ fi >+ >+ AS_VAR_POPDEF([MAJOR])dnl >+ AS_VAR_POPDEF([MINOR])dnl >+ fi >+ >+ AS_VAR_POPDEF([HEADER_VERSION])dnl >+ AS_VAR_POPDEF([TEST_LIBNAME])dnl >+ >+ dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. >+ if test "$ax_path_bdb_env_confirm_lib_ok" = "yes" ; then >+ m4_ifvaln([$1],[$1],[:])dnl >+ m4_ifvaln([$2],[else $2])dnl >+ fi >+ >+]) dnl BDB_ENV_GET_VERSION >+ >+############################################################################# >+ >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 19192
:
10542
|
26133
|
38889
|
38890
|
39137
|
39203
|
39204
|
39571
|
39572