Changeset 10771


Ignore:
Timestamp:
2005-10-26T13:18:04+13:00 (19 years ago)
Author:
kjdon
Message:

modified so can have gdbm in a non-default path (eg on Macosx), and made configure take the --with-gdbm option. this was copied from gs2 main configure

Location:
trunk/gsdl3
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/packages/javagdbm/configure

    r10737 r10771  
    11#! /bin/sh
    2 # From configure.in Revision: 1.5 .
     2# From configure.in Revision: 1.1 .
    33# Guess values for system-dependent variables and create Makefiles.
    44# Generated by GNU Autoconf 2.59.
     
    311311#endif"
    312312
    313 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CPP EGREP JAVA_HOME javagdbm_cv_path_javah javagdbm_cv_path_java PKG JNIINC JNISUFFIX JNIFLAGS LIBOBJS LTLIBOBJS'
     313ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CPP EGREP JAVA_HOME javagdbm_cv_path_javah javagdbm_cv_path_java GDBM_LIBPATH GDBM_INCLUDE PKG JNIINC JNISUFFIX JNIFLAGS LIBOBJS LTLIBOBJS'
    314314ac_subst_files=''
    315315
     
    838838
    839839  cat <<\_ACEOF
     840
     841Optional Packages:
     842  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
     843  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
     844  --with-gdbm=dir         Use local gdbm library and headers
    840845
    841846Some influential environment variables:
     
    12871292
    12881293
     1294
     1295# Check whether --with-gdbm or --without-gdbm was given.
     1296if test "${with_gdbm+set}" = set; then
     1297  withval="$with_gdbm"
     1298  gdbmdir=$withval
     1299fi;
     1300
    12891301# TODO: allow the user to specify whether they want a debugging
    12901302# library or not?
     
    41844196
    41854197# check for gdbm library
    4186 echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
    4187 echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6
    4188 if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
    4189   echo $ECHO_N "(cached) $ECHO_C" >&6
    4190 else
    4191   ac_check_lib_save_LIBS=$LIBS
    4192 LIBS="-lgdbm  $LIBS"
    4193 cat >conftest.$ac_ext <<_ACEOF
     4198#AC_CHECK_LIB(gdbm, gdbm_open, [javagdbm_cv_lib_gdbm="-lgdbm"],
     4199#   [javagdbm_cv_lib_gdbm=no])
     4200#if test "$javagdbm_cv_lib_gdbm" = "no"; then
     4201#   AC_MSG_ERROR([no native gdbm library found.])
     4202#fi
     4203#LIBS="$javagdbm_cv_lib_gdbm"
     4204
     4205# gdbm stuff copied from gsdl [kjdon]
     4206
     4207
     4208echo "$as_me:$LINENO: checking that the GDBM library is available" >&5
     4209echo $ECHO_N "checking that the GDBM library is available... $ECHO_C" >&6
     4210if test ! -z "$gdbmdir" ; then
     4211  # look in given directory for header file
     4212  if test -r $gdbmdir/include/gdbm.h ; then
     4213    GDBM_INCLUDE="-I$gdbmdir/include" ;
     4214  elif test -r $gdbmdir/gdbm.h ; then
     4215    GDBM_INCLUDE="-I$gdbmdir" ;
     4216  fi
     4217
     4218  # look in given directory for library
     4219  if test -r $gdbmdir/libgdbm.a ; then
     4220    GDBM_LIBPATH="-L$gdbmdir" ;
     4221  elif test -r $gdbmdir/lib/libgdbm.a ; then
     4222    GDBM_LIBPATH="-L$gdbmdir/lib" ;
     4223  elif test -r $gdbmdir/.libs/libgdbm.a ; then
     4224    GDBM_LIBPATH="-L$gdbmdir/.libs" ;
     4225  fi
     4226
     4227  if test ! -z "$GDBM_LIBPATH" -a ! -z "$GDBM_INCLUDE" ; then
     4228    echo "$as_me:$LINENO: result: $gdbmdir" >&5
     4229echo "${ECHO_T}$gdbmdir" >&6 ;
     4230  else
     4231    echo "$as_me:$LINENO: result: can't find gdbm.h and libgdbm.a in $gdbmdir" >&5
     4232echo "${ECHO_T}can't find gdbm.h and libgdbm.a in $gdbmdir" >&6;
     4233    echo "$as_me:$LINENO: checking looking for GDBM library in default locations" >&5
     4234echo $ECHO_N "checking looking for GDBM library in default locations... $ECHO_C" >&6
     4235  fi
     4236fi
     4237
     4238# look in default path and in /usr/local
     4239if test -z "$GDBM_INCLUDE" ; then
     4240  # try in system directory
     4241  cat >conftest.$ac_ext <<_ACEOF
    41944242/* confdefs.h.  */
    41954243_ACEOF
     
    41974245cat >>conftest.$ac_ext <<_ACEOF
    41984246/* end confdefs.h.  */
    4199 
    4200 /* Override any gcc2 internal prototype to avoid an error.  */
    4201 #ifdef __cplusplus
    4202 extern "C"
    4203 #endif
    4204 /* We use char because int might match the return type of a gcc2
    4205    builtin and then its argument prototype would still apply.  */
    4206 char gdbm_open ();
     4247#include <gdbm.h>
     4248
    42074249int
    42084250main ()
    42094251{
    4210 gdbm_open ();
     4252
    42114253  ;
    42124254  return 0;
    42134255}
    42144256_ACEOF
     4257rm -f conftest.$ac_objext
     4258if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     4259  (eval $ac_compile) 2>conftest.er1
     4260  ac_status=$?
     4261  grep -v '^ *+' conftest.er1 >conftest.err
     4262  rm -f conftest.er1
     4263  cat conftest.err >&5
     4264  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4265  (exit $ac_status); } &&
     4266     { ac_try='test -z "$ac_c_werror_flag"
     4267             || test ! -s conftest.err'
     4268  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4269  (eval $ac_try) 2>&5
     4270  ac_status=$?
     4271  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4272  (exit $ac_status); }; } &&
     4273     { ac_try='test -s conftest.$ac_objext'
     4274  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4275  (eval $ac_try) 2>&5
     4276  ac_status=$?
     4277  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4278  (exit $ac_status); }; }; then
     4279  success=yes
     4280else
     4281  echo "$as_me: failed program was:" >&5
     4282sed 's/^/| /' conftest.$ac_ext >&5
     4283
     4284success=no
     4285
     4286fi
     4287rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     4288
     4289  if test $success = "no"; then
     4290# last chance - look in /usr/local (eg FreeBSD)
     4291    GDBM_LIBPATH=-L/usr/local/lib
     4292    GDBM_INCLUDE=-I/usr/local/include
     4293    ac_save_CXXFLAGS="$CXXFLAGS"
     4294    ac_save_LIBS="$LIBS"
     4295      CXXFLAGS="$CXXFLAGS -I/usr/local/include"
     4296      LIBS="$LIBS -L/usr/local/lib -lgdbm"
     4297      cat >conftest.$ac_ext <<_ACEOF
     4298/* confdefs.h.  */
     4299_ACEOF
     4300cat confdefs.h >>conftest.$ac_ext
     4301cat >>conftest.$ac_ext <<_ACEOF
     4302/* end confdefs.h.  */
     4303#include <gdbm.h>
     4304#include <stdio.h>
     4305
     4306int
     4307main ()
     4308{
     4309printf("%s",gdbm_version);
     4310  ;
     4311  return 0;
     4312}
     4313_ACEOF
    42154314rm -f conftest.$ac_objext conftest$ac_exeext
    42164315if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     
    42354334  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    42364335  (exit $ac_status); }; }; then
    4237   ac_cv_lib_gdbm_gdbm_open=yes
     4336  success=/usr/local
    42384337else
    42394338  echo "$as_me: failed program was:" >&5
    42404339sed 's/^/| /' conftest.$ac_ext >&5
    42414340
    4242 ac_cv_lib_gdbm_gdbm_open=no
     4341success=no
     4342
    42434343fi
    42444344rm -f conftest.err conftest.$ac_objext \
    42454345      conftest$ac_exeext conftest.$ac_ext
    4246 LIBS=$ac_check_lib_save_LIBS
    4247 fi
    4248 echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
    4249 echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6
    4250 if test $ac_cv_lib_gdbm_gdbm_open = yes; then
    4251   javagdbm_cv_lib_gdbm="-lgdbm"
    4252 else
    4253   javagdbm_cv_lib_gdbm=no
    4254 fi
    4255 
    4256 if test "$javagdbm_cv_lib_gdbm" = "no"; then
    4257     { { echo "$as_me:$LINENO: error: no native gdbm library found." >&5
    4258 echo "$as_me: error: no native gdbm library found." >&2;}
     4346      CXXFLAGS=$ac_save_CXXFLAGS
     4347      LIBS=$ac_save_LIBS
     4348  fi
     4349
     4350  echo "$as_me:$LINENO: result: $success" >&5
     4351echo "${ECHO_T}$success" >&6
     4352  if test $success = "no"; then
     4353  { { echo "$as_me:$LINENO: error: GDBM Library not available - cannot install" >&5
     4354echo "$as_me: error: GDBM Library not available - cannot install" >&2;}
    42594355   { (exit 1); exit 1; }; }
    4260 fi
    4261 LIBS="$javagdbm_cv_lib_gdbm"
     4356  fi
     4357fi
     4358cat >>confdefs.h <<\_ACEOF
     4359#define HAVE_LIBGDBM  1
     4360_ACEOF
     4361
     4362
     4363
     4364
    42624365
    42634366########## set compiler options
     
    49475050s,@javagdbm_cv_path_javah@,$javagdbm_cv_path_javah,;t t
    49485051s,@javagdbm_cv_path_java@,$javagdbm_cv_path_java,;t t
     5052s,@GDBM_LIBPATH@,$GDBM_LIBPATH,;t t
     5053s,@GDBM_INCLUDE@,$GDBM_INCLUDE,;t t
    49495054s,@PKG@,$PKG,;t t
    49505055s,@JNIINC@,$JNIINC,;t t
  • trunk/gsdl3/packages/javagdbm/configure.in

    r10737 r10771  
    2424
    2525AC_INIT(jni/gdbmjava.c)
     26
     27dnl
     28dnl look for libgdbm if not in standard location
     29dnl
     30AC_ARG_WITH(gdbm, [  --with-gdbm=dir         Use local gdbm library and headers], gdbmdir=$withval)
    2631
    2732# TODO: allow the user to specify whether they want a debugging
     
    6671
    6772# check for gdbm library
    68 AC_CHECK_LIB(gdbm, gdbm_open, [javagdbm_cv_lib_gdbm="-lgdbm"],
    69     [javagdbm_cv_lib_gdbm=no])
    70 if test "$javagdbm_cv_lib_gdbm" = "no"; then
    71     AC_MSG_ERROR([no native gdbm library found.])
     73#AC_CHECK_LIB(gdbm, gdbm_open, [javagdbm_cv_lib_gdbm="-lgdbm"],
     74#   [javagdbm_cv_lib_gdbm=no])
     75#if test "$javagdbm_cv_lib_gdbm" = "no"; then
     76#   AC_MSG_ERROR([no native gdbm library found.])
     77#fi
     78#LIBS="$javagdbm_cv_lib_gdbm"
     79
     80# gdbm stuff copied from gsdl [kjdon]
     81
     82dnl
     83dnl Check that the GDBM library is available
     84dnl
     85dnl check libgdbm manually, in case it's not in the standard location.
     86
     87AC_MSG_CHECKING(that the GDBM library is available)
     88if test ! -z "$gdbmdir" ; then
     89  # look in given directory for header file
     90  if test -r $gdbmdir/include/gdbm.h ; then
     91    GDBM_INCLUDE="-I$gdbmdir/include" ;
     92  elif test -r $gdbmdir/gdbm.h ; then
     93    GDBM_INCLUDE="-I$gdbmdir" ;
     94  fi
     95
     96  # look in given directory for library
     97  if test -r $gdbmdir/libgdbm.a ; then
     98    GDBM_LIBPATH="-L$gdbmdir" ;
     99  elif test -r $gdbmdir/lib/libgdbm.a ; then
     100    GDBM_LIBPATH="-L$gdbmdir/lib" ;
     101  elif test -r $gdbmdir/.libs/libgdbm.a ; then
     102    GDBM_LIBPATH="-L$gdbmdir/.libs" ;
     103  fi
     104
     105  if test ! -z "$GDBM_LIBPATH" -a ! -z "$GDBM_INCLUDE" ; then
     106    AC_MSG_RESULT($gdbmdir) ;
     107  else
     108    AC_MSG_RESULT(can't find gdbm.h and libgdbm.a in $gdbmdir);
     109    AC_MSG_CHECKING(   looking for GDBM library in default locations)
     110  fi
    72111fi
    73 LIBS="$javagdbm_cv_lib_gdbm"
     112
     113# look in default path and in /usr/local
     114if test -z "$GDBM_INCLUDE" ; then
     115  # try in system directory
     116  AC_TRY_COMPILE(
     117  [#include <gdbm.h>
     118],
     119  [],
     120  success=yes,
     121  success=no
     122  )
     123
     124  if test $success = "no"; then
     125# last chance - look in /usr/local (eg FreeBSD)
     126    GDBM_LIBPATH=-L/usr/local/lib
     127    GDBM_INCLUDE=-I/usr/local/include
     128    ac_save_CXXFLAGS="$CXXFLAGS"
     129    ac_save_LIBS="$LIBS"
     130      CXXFLAGS="$CXXFLAGS -I/usr/local/include"
     131      LIBS="$LIBS -L/usr/local/lib -lgdbm"
     132      AC_TRY_LINK(
     133    [#include <gdbm.h>
     134#include <stdio.h>
     135    ],
     136    [printf("%s",gdbm_version);],
     137    success=/usr/local,
     138    success=no
     139      )
     140      CXXFLAGS=$ac_save_CXXFLAGS
     141      LIBS=$ac_save_LIBS
     142  fi
     143
     144  AC_MSG_RESULT($success)
     145  if test $success = "no"; then
     146  AC_MSG_ERROR(GDBM Library not available - cannot install)
     147  fi
     148fi
     149dnl I don't think anything actually checks this define, but...
     150AC_DEFINE(HAVE_LIBGDBM , 1)
     151
     152AC_SUBST(GDBM_LIBPATH)
     153AC_SUBST(GDBM_INCLUDE)
    74154
    75155########## set compiler options
  • trunk/gsdl3/packages/javagdbm/jni/Makefile.in

    r10737 r10771  
    2424CC=@CC@
    2525JDK=@JAVA_HOME@
    26 INC=-I. -I$(JDK)/include -I$(JDK)/include/linux
     26INC=-I. -I$(JDK)/include -I$(JDK)/include/linux @GDBM_INCLUDE@
    2727CFLAGS=-c @CFLAGS@ $(INC) -DWRAPPER_VERSION=\"$(WRAPPER_VERSION)\"
    2828#PKG=@PKG@
    29 LIBS=@LIBS@
     29GDBM_LIBS=@GDBM_LIBPATH@ -lgdbm
     30LIBS= $(GDBM_LIBS) @LIBS@
    3031LDFLAGS = @LDFLAGS@
    3132JNIFLAGS=@JNIFLAGS@
  • trunk/gsdl3/src/packages/javagdbm/configure

    r10737 r10771  
    11#! /bin/sh
    2 # From configure.in Revision: 1.5 .
     2# From configure.in Revision: 1.1 .
    33# Guess values for system-dependent variables and create Makefiles.
    44# Generated by GNU Autoconf 2.59.
     
    311311#endif"
    312312
    313 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CPP EGREP JAVA_HOME javagdbm_cv_path_javah javagdbm_cv_path_java PKG JNIINC JNISUFFIX JNIFLAGS LIBOBJS LTLIBOBJS'
     313ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S CPP EGREP JAVA_HOME javagdbm_cv_path_javah javagdbm_cv_path_java GDBM_LIBPATH GDBM_INCLUDE PKG JNIINC JNISUFFIX JNIFLAGS LIBOBJS LTLIBOBJS'
    314314ac_subst_files=''
    315315
     
    838838
    839839  cat <<\_ACEOF
     840
     841Optional Packages:
     842  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
     843  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
     844  --with-gdbm=dir         Use local gdbm library and headers
    840845
    841846Some influential environment variables:
     
    12871292
    12881293
     1294
     1295# Check whether --with-gdbm or --without-gdbm was given.
     1296if test "${with_gdbm+set}" = set; then
     1297  withval="$with_gdbm"
     1298  gdbmdir=$withval
     1299fi;
     1300
    12891301# TODO: allow the user to specify whether they want a debugging
    12901302# library or not?
     
    41844196
    41854197# check for gdbm library
    4186 echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
    4187 echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6
    4188 if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
    4189   echo $ECHO_N "(cached) $ECHO_C" >&6
    4190 else
    4191   ac_check_lib_save_LIBS=$LIBS
    4192 LIBS="-lgdbm  $LIBS"
    4193 cat >conftest.$ac_ext <<_ACEOF
     4198#AC_CHECK_LIB(gdbm, gdbm_open, [javagdbm_cv_lib_gdbm="-lgdbm"],
     4199#   [javagdbm_cv_lib_gdbm=no])
     4200#if test "$javagdbm_cv_lib_gdbm" = "no"; then
     4201#   AC_MSG_ERROR([no native gdbm library found.])
     4202#fi
     4203#LIBS="$javagdbm_cv_lib_gdbm"
     4204
     4205# gdbm stuff copied from gsdl [kjdon]
     4206
     4207
     4208echo "$as_me:$LINENO: checking that the GDBM library is available" >&5
     4209echo $ECHO_N "checking that the GDBM library is available... $ECHO_C" >&6
     4210if test ! -z "$gdbmdir" ; then
     4211  # look in given directory for header file
     4212  if test -r $gdbmdir/include/gdbm.h ; then
     4213    GDBM_INCLUDE="-I$gdbmdir/include" ;
     4214  elif test -r $gdbmdir/gdbm.h ; then
     4215    GDBM_INCLUDE="-I$gdbmdir" ;
     4216  fi
     4217
     4218  # look in given directory for library
     4219  if test -r $gdbmdir/libgdbm.a ; then
     4220    GDBM_LIBPATH="-L$gdbmdir" ;
     4221  elif test -r $gdbmdir/lib/libgdbm.a ; then
     4222    GDBM_LIBPATH="-L$gdbmdir/lib" ;
     4223  elif test -r $gdbmdir/.libs/libgdbm.a ; then
     4224    GDBM_LIBPATH="-L$gdbmdir/.libs" ;
     4225  fi
     4226
     4227  if test ! -z "$GDBM_LIBPATH" -a ! -z "$GDBM_INCLUDE" ; then
     4228    echo "$as_me:$LINENO: result: $gdbmdir" >&5
     4229echo "${ECHO_T}$gdbmdir" >&6 ;
     4230  else
     4231    echo "$as_me:$LINENO: result: can't find gdbm.h and libgdbm.a in $gdbmdir" >&5
     4232echo "${ECHO_T}can't find gdbm.h and libgdbm.a in $gdbmdir" >&6;
     4233    echo "$as_me:$LINENO: checking looking for GDBM library in default locations" >&5
     4234echo $ECHO_N "checking looking for GDBM library in default locations... $ECHO_C" >&6
     4235  fi
     4236fi
     4237
     4238# look in default path and in /usr/local
     4239if test -z "$GDBM_INCLUDE" ; then
     4240  # try in system directory
     4241  cat >conftest.$ac_ext <<_ACEOF
    41944242/* confdefs.h.  */
    41954243_ACEOF
     
    41974245cat >>conftest.$ac_ext <<_ACEOF
    41984246/* end confdefs.h.  */
    4199 
    4200 /* Override any gcc2 internal prototype to avoid an error.  */
    4201 #ifdef __cplusplus
    4202 extern "C"
    4203 #endif
    4204 /* We use char because int might match the return type of a gcc2
    4205    builtin and then its argument prototype would still apply.  */
    4206 char gdbm_open ();
     4247#include <gdbm.h>
     4248
    42074249int
    42084250main ()
    42094251{
    4210 gdbm_open ();
     4252
    42114253  ;
    42124254  return 0;
    42134255}
    42144256_ACEOF
     4257rm -f conftest.$ac_objext
     4258if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     4259  (eval $ac_compile) 2>conftest.er1
     4260  ac_status=$?
     4261  grep -v '^ *+' conftest.er1 >conftest.err
     4262  rm -f conftest.er1
     4263  cat conftest.err >&5
     4264  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4265  (exit $ac_status); } &&
     4266     { ac_try='test -z "$ac_c_werror_flag"
     4267             || test ! -s conftest.err'
     4268  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4269  (eval $ac_try) 2>&5
     4270  ac_status=$?
     4271  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4272  (exit $ac_status); }; } &&
     4273     { ac_try='test -s conftest.$ac_objext'
     4274  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4275  (eval $ac_try) 2>&5
     4276  ac_status=$?
     4277  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4278  (exit $ac_status); }; }; then
     4279  success=yes
     4280else
     4281  echo "$as_me: failed program was:" >&5
     4282sed 's/^/| /' conftest.$ac_ext >&5
     4283
     4284success=no
     4285
     4286fi
     4287rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     4288
     4289  if test $success = "no"; then
     4290# last chance - look in /usr/local (eg FreeBSD)
     4291    GDBM_LIBPATH=-L/usr/local/lib
     4292    GDBM_INCLUDE=-I/usr/local/include
     4293    ac_save_CXXFLAGS="$CXXFLAGS"
     4294    ac_save_LIBS="$LIBS"
     4295      CXXFLAGS="$CXXFLAGS -I/usr/local/include"
     4296      LIBS="$LIBS -L/usr/local/lib -lgdbm"
     4297      cat >conftest.$ac_ext <<_ACEOF
     4298/* confdefs.h.  */
     4299_ACEOF
     4300cat confdefs.h >>conftest.$ac_ext
     4301cat >>conftest.$ac_ext <<_ACEOF
     4302/* end confdefs.h.  */
     4303#include <gdbm.h>
     4304#include <stdio.h>
     4305
     4306int
     4307main ()
     4308{
     4309printf("%s",gdbm_version);
     4310  ;
     4311  return 0;
     4312}
     4313_ACEOF
    42154314rm -f conftest.$ac_objext conftest$ac_exeext
    42164315if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     
    42354334  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    42364335  (exit $ac_status); }; }; then
    4237   ac_cv_lib_gdbm_gdbm_open=yes
     4336  success=/usr/local
    42384337else
    42394338  echo "$as_me: failed program was:" >&5
    42404339sed 's/^/| /' conftest.$ac_ext >&5
    42414340
    4242 ac_cv_lib_gdbm_gdbm_open=no
     4341success=no
     4342
    42434343fi
    42444344rm -f conftest.err conftest.$ac_objext \
    42454345      conftest$ac_exeext conftest.$ac_ext
    4246 LIBS=$ac_check_lib_save_LIBS
    4247 fi
    4248 echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
    4249 echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6
    4250 if test $ac_cv_lib_gdbm_gdbm_open = yes; then
    4251   javagdbm_cv_lib_gdbm="-lgdbm"
    4252 else
    4253   javagdbm_cv_lib_gdbm=no
    4254 fi
    4255 
    4256 if test "$javagdbm_cv_lib_gdbm" = "no"; then
    4257     { { echo "$as_me:$LINENO: error: no native gdbm library found." >&5
    4258 echo "$as_me: error: no native gdbm library found." >&2;}
     4346      CXXFLAGS=$ac_save_CXXFLAGS
     4347      LIBS=$ac_save_LIBS
     4348  fi
     4349
     4350  echo "$as_me:$LINENO: result: $success" >&5
     4351echo "${ECHO_T}$success" >&6
     4352  if test $success = "no"; then
     4353  { { echo "$as_me:$LINENO: error: GDBM Library not available - cannot install" >&5
     4354echo "$as_me: error: GDBM Library not available - cannot install" >&2;}
    42594355   { (exit 1); exit 1; }; }
    4260 fi
    4261 LIBS="$javagdbm_cv_lib_gdbm"
     4356  fi
     4357fi
     4358cat >>confdefs.h <<\_ACEOF
     4359#define HAVE_LIBGDBM  1
     4360_ACEOF
     4361
     4362
     4363
     4364
    42624365
    42634366########## set compiler options
     
    49475050s,@javagdbm_cv_path_javah@,$javagdbm_cv_path_javah,;t t
    49485051s,@javagdbm_cv_path_java@,$javagdbm_cv_path_java,;t t
     5052s,@GDBM_LIBPATH@,$GDBM_LIBPATH,;t t
     5053s,@GDBM_INCLUDE@,$GDBM_INCLUDE,;t t
    49495054s,@PKG@,$PKG,;t t
    49505055s,@JNIINC@,$JNIINC,;t t
  • trunk/gsdl3/src/packages/javagdbm/configure.in

    r10737 r10771  
    2424
    2525AC_INIT(jni/gdbmjava.c)
     26
     27dnl
     28dnl look for libgdbm if not in standard location
     29dnl
     30AC_ARG_WITH(gdbm, [  --with-gdbm=dir         Use local gdbm library and headers], gdbmdir=$withval)
    2631
    2732# TODO: allow the user to specify whether they want a debugging
     
    6671
    6772# check for gdbm library
    68 AC_CHECK_LIB(gdbm, gdbm_open, [javagdbm_cv_lib_gdbm="-lgdbm"],
    69     [javagdbm_cv_lib_gdbm=no])
    70 if test "$javagdbm_cv_lib_gdbm" = "no"; then
    71     AC_MSG_ERROR([no native gdbm library found.])
     73#AC_CHECK_LIB(gdbm, gdbm_open, [javagdbm_cv_lib_gdbm="-lgdbm"],
     74#   [javagdbm_cv_lib_gdbm=no])
     75#if test "$javagdbm_cv_lib_gdbm" = "no"; then
     76#   AC_MSG_ERROR([no native gdbm library found.])
     77#fi
     78#LIBS="$javagdbm_cv_lib_gdbm"
     79
     80# gdbm stuff copied from gsdl [kjdon]
     81
     82dnl
     83dnl Check that the GDBM library is available
     84dnl
     85dnl check libgdbm manually, in case it's not in the standard location.
     86
     87AC_MSG_CHECKING(that the GDBM library is available)
     88if test ! -z "$gdbmdir" ; then
     89  # look in given directory for header file
     90  if test -r $gdbmdir/include/gdbm.h ; then
     91    GDBM_INCLUDE="-I$gdbmdir/include" ;
     92  elif test -r $gdbmdir/gdbm.h ; then
     93    GDBM_INCLUDE="-I$gdbmdir" ;
     94  fi
     95
     96  # look in given directory for library
     97  if test -r $gdbmdir/libgdbm.a ; then
     98    GDBM_LIBPATH="-L$gdbmdir" ;
     99  elif test -r $gdbmdir/lib/libgdbm.a ; then
     100    GDBM_LIBPATH="-L$gdbmdir/lib" ;
     101  elif test -r $gdbmdir/.libs/libgdbm.a ; then
     102    GDBM_LIBPATH="-L$gdbmdir/.libs" ;
     103  fi
     104
     105  if test ! -z "$GDBM_LIBPATH" -a ! -z "$GDBM_INCLUDE" ; then
     106    AC_MSG_RESULT($gdbmdir) ;
     107  else
     108    AC_MSG_RESULT(can't find gdbm.h and libgdbm.a in $gdbmdir);
     109    AC_MSG_CHECKING(   looking for GDBM library in default locations)
     110  fi
    72111fi
    73 LIBS="$javagdbm_cv_lib_gdbm"
     112
     113# look in default path and in /usr/local
     114if test -z "$GDBM_INCLUDE" ; then
     115  # try in system directory
     116  AC_TRY_COMPILE(
     117  [#include <gdbm.h>
     118],
     119  [],
     120  success=yes,
     121  success=no
     122  )
     123
     124  if test $success = "no"; then
     125# last chance - look in /usr/local (eg FreeBSD)
     126    GDBM_LIBPATH=-L/usr/local/lib
     127    GDBM_INCLUDE=-I/usr/local/include
     128    ac_save_CXXFLAGS="$CXXFLAGS"
     129    ac_save_LIBS="$LIBS"
     130      CXXFLAGS="$CXXFLAGS -I/usr/local/include"
     131      LIBS="$LIBS -L/usr/local/lib -lgdbm"
     132      AC_TRY_LINK(
     133    [#include <gdbm.h>
     134#include <stdio.h>
     135    ],
     136    [printf("%s",gdbm_version);],
     137    success=/usr/local,
     138    success=no
     139      )
     140      CXXFLAGS=$ac_save_CXXFLAGS
     141      LIBS=$ac_save_LIBS
     142  fi
     143
     144  AC_MSG_RESULT($success)
     145  if test $success = "no"; then
     146  AC_MSG_ERROR(GDBM Library not available - cannot install)
     147  fi
     148fi
     149dnl I don't think anything actually checks this define, but...
     150AC_DEFINE(HAVE_LIBGDBM , 1)
     151
     152AC_SUBST(GDBM_LIBPATH)
     153AC_SUBST(GDBM_INCLUDE)
    74154
    75155########## set compiler options
  • trunk/gsdl3/src/packages/javagdbm/jni/Makefile.in

    r10737 r10771  
    2424CC=@CC@
    2525JDK=@JAVA_HOME@
    26 INC=-I. -I$(JDK)/include -I$(JDK)/include/linux
     26INC=-I. -I$(JDK)/include -I$(JDK)/include/linux @GDBM_INCLUDE@
    2727CFLAGS=-c @CFLAGS@ $(INC) -DWRAPPER_VERSION=\"$(WRAPPER_VERSION)\"
    2828#PKG=@PKG@
    29 LIBS=@LIBS@
     29GDBM_LIBS=@GDBM_LIBPATH@ -lgdbm
     30LIBS= $(GDBM_LIBS) @LIBS@
    3031LDFLAGS = @LDFLAGS@
    3132JNIFLAGS=@JNIFLAGS@
Note: See TracChangeset for help on using the changeset viewer.