Changeset 21444 for main/trunk/gs2runtime

Timestamp:

2010-01-12T14:01:03+13:00 (13 years ago)

Author:

davidb

Message:

If statement should use 'test' not '[...]' in autoconfigure file

File:

• main/trunk/gs2runtime/configure.in (modified) (3 diffs)

main/trunk/gs2runtime/configure.in

@@ -59 +59 @@
 dnl fi
 
-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 
 dnl disable compilation of accent folding stuff for mgpp (and one day mg)
 dnl
@@ -250 +244 @@
 
 dnl
-dnl Check that the GDBM library is available
-dnl
-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 -r $gdbmdir/include/gdbm.h ; then
-    GDBM_INCLUDE="-I$gdbmdir/include" ;
-  elif test -r $gdbmdir/gdbm.h ; then
-    GDBM_INCLUDE="-I$gdbmdir" ;
-  fi
-
-  # look in given directory for library
-  if test -r $gdbmdir/libgdbm.a ; then
-    GDBM_LIBPATH="-L$gdbmdir" ;
-  elif test -r $gdbmdir/lib/libgdbm.a ; then
-    GDBM_LIBPATH="-L$gdbmdir/lib" ;
-  elif test -r $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) ;
-  else
-    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 
-  AC_TRY_COMPILE(
-  [#include <gdbm.h>
-],
-  [],
-  success=yes,
-  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
-fi
-dnl I don't think anything actually checks this define, but...
-AC_DEFINE(HAVE_LIBGDBM , 1)
-
-AC_SUBST(GDBM_LIBPATH)
-AC_SUBST(GDBM_INCLUDE)
-
-dnl
 dnl Check if the STL library has any known faults;
 dnl In GCC 2.7.2.x series, some STL library headers are missing
@@ -392 +313 @@
 moduleDirs=""
 MODULEDIRS=""
-if [ -d modules ] ; then
+if test -d modules ; then
   for x in `find modules -mindepth 1 -maxdepth 2`; do
     if test -d "$x"; then