Changeset 2603

Timestamp:

2001-06-21T14:35:31+12:00 (23 years ago)

Author:

jrm21

Message:

Look for gdbm in /usr/local before failing (eg FreeBSD).

Location:

trunk/gsdl

Files:

• configure (modified) (10 diffs)
• configure.in (modified) (2 diffs)

trunk/gsdl/configure

@@ -3182 +3182 @@
   if test ! -z "$GDBM_LIBPATH" -a ! -z "$GDBM_INCLUDE" ; then
     echo "$ac_t""$gdbmdir" 1>&6 ;
-    cat >> confdefs.h <<\EOF
-#define HAVE_LIBGDBM  1
-EOF
-
   else
-    echo "$ac_t""can't find both gdbm.h and libgdbm.a in $gdbmdir" 1>&6;
+    echo "$ac_t""can't find gdbm.h and libgdbm.a in $gdbmdir" 1>&6;
     echo $ac_n "checking looking for GDBM library in default locations""... $ac_c" 1>&6
-echo "configure:3192: checking looking for GDBM library in default locations" >&5
+echo "configure:3188: checking looking for GDBM library in default locations" >&5
   fi
 fi
 
+# look in default path and in /usr/local
 if test -z "$GDBM_INCLUDE" ; then
   # try in system directory 
   cat > conftest.$ac_ext <<EOF
-#line 3199 "configure"
+#line 3196 "configure"
 #include "confdefs.h"
 #include <gdbm.h>
@@ -3204 +3201 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   success=yes
@@ -3215 +3212 @@
 fi
 rm -f conftest*
+
+  if test $success = "no"; then
+# last chance - look in /usr/local (eg FreeBSD)
+    GDBM_LIBPATH=-L/usr/local/lib
+    GDBM_INCLUDE=-I/usr/local/include
+    ac_save_CXXFLAGS="$CXXFLAGS"
+    ac_save_LIBS="$LIBS"
+      CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+      LIBS="$LIBS -L/usr/local/lib -lgdbm"
+      cat > conftest.$ac_ext <<EOF
+#line 3225 "configure"
+#include "confdefs.h"
+#include <gdbm.h>
+#include <stdio.h>
+    
+int main() {
+printf("%s",gdbm_version);
+; return 0; }
+EOF
+if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  success=/usr/local
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  success=no
+      
+fi
+rm -f conftest*
+      CXXFLAGS=$ac_save_CXXFLAGS
+      LIBS=$ac_save_LIBS
+  fi
+
   echo "$ac_t""$success" 1>&6
   if test $success = "no"; then
   { echo "configure: error: GDBM Library not available - cannot install" 1>&2; exit 1; }
   fi
-  GDBM_LIBPATH=
-  GDBM_INCLUDE=
-fi
+fi
+cat >> confdefs.h <<\EOF
+#define HAVE_LIBGDBM  1
+EOF
+
 
 
@@ -3227 +3260 @@
 
 echo $ac_n "checking that Perl 5 is available""... $ac_c" 1>&6
-echo "configure:3230: checking that Perl 5 is available" >&5
+echo "configure:3263: checking that Perl 5 is available" >&5
 success="no"
 pl_path="$PATH"
@@ -3257 +3290 @@
 success=no
 echo $ac_n "checking "whether STL library has known faults"""... $ac_c" 1>&6
-echo "configure:3260: checking "whether STL library has known faults"" >&5
+echo "configure:3293: checking "whether STL library has known faults"" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3263 "configure"
+#line 3296 "configure"
 #include "confdefs.h"
 #include <vector>
@@ -3268 +3301 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   success=yes
@@ -3279 +3312 @@
 if test $success = "no"; then
 cat > conftest.$ac_ext <<EOF
-#line 3282 "configure"
+#line 3315 "configure"
 #include "confdefs.h"
 #include <vector.h>
@@ -3287 +3320 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   success="yes"
@@ -3299 +3332 @@
 if test $success = "no"; then
 cat > conftest.$ac_ext <<EOF
-#line 3302 "configure"
+#line 3335 "configure"
 #include "confdefs.h"
 #include <ospace\\std\\vector>
@@ -3307 +3340 @@
 ; return 0; }
 EOF
-if { (eval echo configure:3310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   success="yes"

trunk/gsdl/configure.in

@@ -208 +208 @@
   if test ! -z "$GDBM_LIBPATH" -a ! -z "$GDBM_INCLUDE" ; then
     AC_MSG_RESULT($gdbmdir) ;
-    AC_DEFINE(HAVE_LIBGDBM , 1)
   else
-    AC_MSG_RESULT(can't find both gdbm.h and libgdbm.a in $gdbmdir);
+    AC_MSG_RESULT(can't find gdbm.h and libgdbm.a in $gdbmdir);
     AC_MSG_CHECKING(   looking for GDBM library in default locations)
   fi
 fi
 
+# look in default path and in /usr/local
 if test -z "$GDBM_INCLUDE" ; then
   # try in system directory 
@@ -224 +224 @@
   success=no
   )
+
+  if test $success = "no"; then
+# last chance - look in /usr/local (eg FreeBSD)
+    GDBM_LIBPATH=-L/usr/local/lib
+    GDBM_INCLUDE=-I/usr/local/include
+    ac_save_CXXFLAGS="$CXXFLAGS"
+    ac_save_LIBS="$LIBS"
+      CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+      LIBS="$LIBS -L/usr/local/lib -lgdbm"
+      AC_TRY_LINK(
+    [#include <gdbm.h>
+#include <stdio.h>
+    ],
+    [printf("%s",gdbm_version);],
+    success=/usr/local,
+    success=no
+      )
+      CXXFLAGS=$ac_save_CXXFLAGS
+      LIBS=$ac_save_LIBS
+  fi
+
   AC_MSG_RESULT($success)
   if test $success = "no"; then
   AC_MSG_ERROR(GDBM Library not available - cannot install)
   fi
-  GDBM_LIBPATH=
-  GDBM_INCLUDE=
-fi
+fi
+dnl I don't think anything actually checks this define, but...
+AC_DEFINE(HAVE_LIBGDBM , 1)
 
 AC_SUBST(GDBM_LIBPATH)