summaryrefslogtreecommitdiff
path: root/sysutils/fastresolve/files/patch-configure.in
blob: 31048a8cf5cba69740067a3502cb2fc5b56c3bdc (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
--- configure.in.orig	Sat May 17 20:15:26 2003
+++ configure.in	Mon Sep  8 00:44:07 2003
@@ -1,6 +1,5 @@
 AC_INIT
 AM_INIT_AUTOMAKE([fastresolve], [2.10])
-AC_ARG_PROGRAM
 AC_PATH_PROGS(PERL, [perl5 perl], [/usr/bin/perl])
 AC_PROG_CC
 AC_PROG_CXX
@@ -26,6 +25,41 @@
 AC_DEFUN(DJM_LIB_DB_CXX,
 [dnl Check for a C++ interface, either version.
 
+AC_ARG_WITH(bdb-lib,
+    [  --with-bdb-lib=PATH	Path to Berkeley DB C++ library],
+    with_bdb_lib=$withval,
+    [ test "${with_bdb_lib+set}" = set || with_bdb_lib=none])
+AC_ARG_WITH(bdb-incdir,
+    [  --with-bdb-incdir=DIR	Berkeley DB C++ includes are in DIR],
+    with_bdb_incdir=$withval,
+    [ test "${with_bdb_incdir+set}" = set || with_bdb_incdir=none])
+
+if test $with_bdb_incdir != none; then
+CXXFLAGS="$CXXFLAGS -I$with_bdb_incdir"
+fi
+
+if test $with_bdb_lib != none; then
+
+dnl Berkeley DB from supplied path
+AC_MSG_CHECKING([for Db::open in ${with_bdb_lib}])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+djm_save_LIBS="$LIBS"
+LIBS="$LIBS $with_bdb_lib"
+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
+	djm_cv_lib_bdb_cxx_Db=yes, djm_cv_lib_bdb_cxx_Db=no)
+LIBS="$djm_save_LIBS"
+AC_LANG_RESTORE
+AC_MSG_RESULT($djm_cv_lib_bdb_cxx_Db)
+
+if test $djm_cv_lib_bdb_cxx_Db = yes; then
+	LIBS="$LIBS $with_bdb_lib"
+else
+	AC_MSG_ERROR([Berkeley DB library 2.x-4.x configured with --enable-cxx is required])
+fi
+
+else
+
 dnl Berkeley DB 2.x.
 AC_CACHE_CHECK([for Db::open in -ldb], djm_cv_lib_db_Dbopen,
 [AC_LANG_SAVE
@@ -41,54 +75,69 @@
 	LIBS="$LIBS -ldb"
 else
 
-dnl Berkeley DB 3.x installed as libdb.
-AC_CACHE_CHECK([for Db::open in -ldb_cxx], djm_cv_lib_db_cxx_Dbopen,
+
+dnl Berkeley DB 3.x or 4.x installed as libdb.
+AC_CACHE_CHECK([for Db in -ldb_cxx], djm_cv_lib_db_cxx_Db,
 [AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 djm_save_LIBS="$LIBS"
 LIBS="$LIBS -ldb -ldb_cxx"
-AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);
-d->open(NULL, NULL, DB_BTREE, DB_CREATE, 0);],
-	djm_cv_lib_db_cxx_Dbopen=yes, djm_cv_lib_db_cxx_Dbopen=no)
+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
+	djm_cv_lib_db_cxx_Db=yes, djm_cv_lib_db_cxx_Db=no)
 LIBS="$djm_save_LIBS"
 AC_LANG_RESTORE])
 
-if test $djm_cv_lib_db_cxx_Dbopen = yes; then
+if test $djm_cv_lib_db_cxx_Db = yes; then
 	LIBS="$LIBS -ldb -ldb_cxx"
 else
 
 dnl Berkeley DB 3.x installed as libdb3 (as on FreeBSD).
-AC_CACHE_CHECK([for Db::open in -ldb3_cxx], djm_cv_lib_db3_cxx_Dbopen,
+AC_CACHE_CHECK([for Db in -ldb3_cxx], djm_cv_lib_db3_cxx_Db,
 [AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 djm_save_LIBS="$LIBS"
 LIBS="$LIBS -ldb3 -ldb3_cxx"
-AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);
-d->open(NULL, NULL, DB_BTREE, DB_CREATE, 0);],
-	djm_cv_lib_db3_cxx_Dbopen=yes, djm_cv_lib_db3_cxx_Dbopen=no)
+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
+	djm_cv_lib_db3_cxx_Db=yes, djm_cv_lib_db3_cxx_Db=no)
 LIBS="$djm_save_LIBS"
 AC_LANG_RESTORE])
 
-if test $djm_cv_lib_db3_cxx_Dbopen = yes; then
+if test $djm_cv_lib_db3_cxx_Db = yes; then
 	LIBS="$LIBS -ldb3 -ldb3_cxx"
 else
 
-dnl Berkeley DB 4.x installed as libdb4 (as on FreeBSD).
-AC_CACHE_CHECK([for Db::open in -ldb4_cxx], djm_cv_lib_db4_cxx_Dbopen,
+dnl Berkeley DB 4.0.x installed as libdb4 (as on FreeBSD).
+AC_CACHE_CHECK([for Db in -ldb4_cxx], djm_cv_lib_db4_cxx_Db,
 [AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 djm_save_LIBS="$LIBS"
 LIBS="$LIBS -ldb4 -ldb4_cxx"
-AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);
-d->open(NULL, NULL, DB_BTREE, DB_CREATE, 0);],
-	djm_cv_lib_db4_cxx_Dbopen=yes, djm_cv_lib_db4_cxx_Dbopen=no)
+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
+	djm_cv_lib_db4_cxx_Db=yes, djm_cv_lib_db4_cxx_Db=no)
 LIBS="$djm_save_LIBS"
 AC_LANG_RESTORE])
 
-if test $djm_cv_lib_db4_cxx_Dbopen = yes; then
+if test $djm_cv_lib_db4_cxx_Db = yes; then
 	LIBS="$LIBS -ldb4 -ldb4_cxx"
 else
+
+dnl Berkeley DB 4.1.x installed as libdb41 (as on FreeBSD).
+AC_CACHE_CHECK([for Db in -ldb41_cxx], djm_cv_lib_db41_cxx_Db,
+[AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+djm_save_LIBS="$LIBS"
+LIBS="$LIBS -ldb41 -ldb41_cxx"
+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
+	djm_cv_lib_db41_cxx_Db=yes, djm_cv_lib_db41_cxx_Db=no)
+LIBS="$djm_save_LIBS"
+AC_LANG_RESTORE])
+
+if test $djm_cv_lib_db41_cxx_Db = yes; then
+	LIBS="$LIBS -ldb41 -ldb41_cxx"
+else
 	AC_MSG_ERROR([Berkeley DB library 2.x-4.x configured with --enable-cxx is required])
+fi
+fi
 fi
 fi
 fi