Changeset 2279 for trunk/gsdl/configure.in

Timestamp:

2001-04-04T16:42:05+12:00 (23 years ago)

Author:

jrm21

Message:

configure now allows an argument to give a path to non-std location of gdbm library.
Other changes to allow darwin (Mac OS X) support include adding config.* to guess the system type.

File:

• trunk/gsdl/configure.in (modified) (5 diffs)

trunk/gsdl/configure.in

@@ -2 +2 @@
 AC_INIT(lib/text_t.h)
 AC_CONFIG_HEADER(config.h)
-AC_ARG_PROGRAM
 
 PACKAGE=gsdl
@@ -39 +38 @@
 AC_SUBST(USE_Z3950)
 
+dnl
+dnl look for libgdbm if not in standard location
+dnl
+AC_ARG_WITH(gdbm, [  --with-gdbm=dir         Use local gdbm library and headers], gdbmdir=$withval)
+
+
+
 dnl Checks for programs.
 LDFLAGS=
@@ -51 +57 @@
 AC_PROG_AWK
 AC_PROG_YACC
+dnl get $target_cpu, $target_vendor, and $target_os
+dnl (as well as host_*)
+AC_CANONICAL_SYSTEM
+dnl do we actually want this? It adds a prefix based on host, system etc
+dnl AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -174 +185 @@
 dnl Check that the GDBM library is available
 dnl
-AC_MSG_CHECKING("that the GDBM library is available")
-AC_TRY_COMPILE(
-[#include <gdbm.h>
+dnl check libgdbm manually, in case it's not in the standard location.
+
+AC_MSG_CHECKING(that the GDBM library is available)
+if test ! -z $gdbmdir ; then
+  # look in given directory for header file
+  if test -e $gdbmdir/include/gdbm.h ; then
+    GDBM_INCLUDE="-I$gdbmdir/include" ;
+  elif test -e $gdbmdir/gdbm.h ; then
+    GDBM_INCLUDE="-I$gdbmdir" ;
+  fi
+
+  # look in given directory for library
+  if test -e $gdbmdir/libgdbm.a ; then
+    GDBM_LIBPATH="-L$gdbmdir" ;
+  elif test -e $gdbmdir/lib/libgdbm.a ; then
+    GDBM_LIBPATH="-L$gdbmdir/lib" ;
+  elif test -e $gdbmdir/.libs/libgdbm.a ; then
+    GDBM_LIBPATH="-L$gdbmdir/.libs" ;
+  fi
+
+  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_CHECKING(   looking for GDBM library in default locations)
+  fi
+fi
+
+if test -z $GDBM_INCLUDE ; then
+  # try in system directory 
+  AC_TRY_COMPILE(
+  [#include <gdbm.h>
 ],
-[],
-success=yes,
-success=no
-)
-AC_MSG_RESULT($success)
-if test $success = "no"; then
-AC_MSG_ERROR("GDBM Library not available - cannot install")
-fi
+  [],
+  success=yes,
+  success=no
+  )
+  AC_MSG_RESULT($success)
+  if test $success = "no"; then
+  AC_MSG_ERROR(GDBM Library not available - cannot install)
+  fi
+  GDBM_LIBPATH=
+  GDBM_INCLUDE=
+fi
+
+AC_SUBST(GDBM_LIBPATH)
+AC_SUBST(GDBM_INCLUDE)
 
 dnl
 dnl Now check that Perl is actually around, and can be found
 dnl
-AC_MSG_CHECKING("that Perl 5 is available")
+AC_MSG_CHECKING(that Perl 5 is available)
 success="no"
 pl_path="$PATH"
@@ -282 +329 @@
 
 # ---------------------------------------------------------------------------
-
+dnl for Darwin, as our packages don't (yet) correctly guess our system type.
+ac_configure_args="$ac_configure_args --host=$host --target=$target"
 AC_CONFIG_SUBDIRS(packages)