conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Don't build gdbm.so if libgdbm isn't found. 

git-svn-id: svn://svn.zoy.org/elk/trunk@98 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-09-06 02:17:09 +00:00
parent 2acd67ca66
commit f244b25ea4
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -345,6 +345,13 @@ AC_DEFINE(OBJ_DIR, "/usr/lib/elk", [FIXME HARD])
#define FIND_AOUT defined(USE_LD) || defined(CAN_DUMP) || defined(INIT_OBJECTS) #define FIND_AOUT defined(USE_LD) || defined(CAN_DUMP) || defined(INIT_OBJECTS)
AC_DEFINE(FIND_AOUT, 1, [FIXME HARD]) AC_DEFINE(FIND_AOUT, 1, [FIXME HARD])
dnl
dnl Check for available libraries
dnl
ac_cv_have_gdbm=no
AC_CHECK_LIB(gdbm, gdbm_open, ac_cv_have_gdbm=yes)
AM_CONDITIONAL(HAVE_GDBM, test "${ac_cv_have_gdbm}" = "yes")
dnl dnl
dnl Check for available warning flags dnl Check for available warning flags
dnl dnl

7
lib/misc/Makefile.am
View File

@ -6,7 +6,7 @@ pkglib_LTLIBRARIES = \
hack.la \ hack.la \
regexp.la \ regexp.la \
debug.la \ debug.la \
gdbm.la \ $(gdbm_la) \
monitor.la \ monitor.la \
record.la \ record.la \
struct.la \ struct.la \
@ -33,6 +33,9 @@ debug_la_SOURCES = debug.c
debug_la_LDFLAGS = -module -avoid-version debug_la_LDFLAGS = -module -avoid-version
debug_la_LIBADD = $(top_builddir)/src/libelk.la debug_la_LIBADD = $(top_builddir)/src/libelk.la
if HAVE_GDBM
gdbm_la = gdbm.la
endif
gdbm_la_SOURCES = gdbm.c gdbm_la_SOURCES = gdbm.c
gdbm_la_LDFLAGS = -module -avoid-version gdbm_la_LDFLAGS = -module -avoid-version
gdbm_la_LIBADD = $(top_builddir)/src/libelk.la -lgdbm gdbm_la_LIBADD = $(top_builddir)/src/libelk.la -lgdbm
@ -51,8 +54,8 @@ struct_la_LIBADD = $(top_builddir)/src/libelk.la
if HAVE_CXX if HAVE_CXX
newhandler_la = newhandler.la newhandler_la = newhandler.la
endif
newhandler_la_SOURCES = newhandler.cpp newhandler_la_SOURCES = newhandler.cpp
newhandler_la_LDFLAGS = -module -avoid-version newhandler_la_LDFLAGS = -module -avoid-version
newhandler_la_LIBADD = $(top_builddir)/src/libelk.la newhandler_la_LIBADD = $(top_builddir)/src/libelk.la
endif

5
scm/Makefile.am
View File

@ -10,7 +10,7 @@ SCM_FILES = \
cscheme.scm \ cscheme.scm \
debug.scm \ debug.scm \
describe.scm \ describe.scm \
gdbmtest.scm \ $(gdbmtest_scm) \
initscheme.scm \ initscheme.scm \
motif.scm \ motif.scm \
oops.scm \ oops.scm \
@ -31,3 +31,6 @@ SCM_FILES = \
xwidgets.scm \ xwidgets.scm \
$(NULL) $(NULL)
if HAVE_GDBM
gdbmtest_scm = gdbmtest.scm
endif