https://sourceforge.net/tracker/index.php?func=detail&aid=2218879&group_id=605&atid=300605 === modified file 'Makefile.in' --- Makefile.in 2008-12-08 18:10:53 +0000 +++ Makefile.in 2008-12-08 18:14:38 +0000 @@ -78,6 +78,7 @@ LDFLAGS= @LDFLAGS@ @LIBS@ LIBOBJS= @LIBOBJS@ +MAALIB= @MAALIB@ EXES= dict dictd dictzip dictfmt all: $(EXES) $(LIBRARIES) @@ -158,12 +159,12 @@ %: %.o $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ $(filter-out local_regex local_zlib local_libmaa, $^) \ - $(OBJS) $(LDFLAGS) -lz + $(OBJS) $(LDFLAGS) $(MAALIB) -lz dictd: dictd.o $(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \ $(filter-out local_regex local_zlib local_libmaa, $^) \ - $(DBILIB) $(OBJS) $(LDFLAGS) -lz + $(DBILIB) $(OBJS) $(LDFLAGS) $(MAALIB) -lz include $(srcdir)/deps === modified file 'configure.in' --- configure.in 2008-12-08 18:10:53 +0000 +++ configure.in 2008-12-08 18:08:55 +0000 @@ -143,26 +143,8 @@ echo . echo Checking for libraries -if test "$local_libmaa" = 0; then - AC_CHECK_LIB(maa,maa_shutdown,XLDFLAGS="$XLDFLAGS -lmaa", +AC_CHECK_LIB(maa,maa_shutdown,MAALIB="-lmaa", [AC_MSG_ERROR([Libmaa not found])]) -fi - -if test "$local_libmaa" = 1; then - AC_MSG_CHECKING(for libmaa in local source tree) - if test -d libmaa; then - XLDFLAGS="$XLDFLAGS -Llibmaa -lmaa" - XCPPFLAGS="$XCPPFLAGS -Ilibmaa" - - AC_CONFIG_SUBDIRS(libmaa) - - allsubdirs="$allsubdirs libmaa" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - AC_MSG_ERROR([Libmaa not found, cannot continue]) - fi -fi AC_CHECK_LIB(Judy, JudySLNext, [JUDYLIB=-lJudy]) AC_CHECK_LIB(dbi, dbi_shutdown, [DBILIB=-ldbi]) @@ -316,6 +298,7 @@ AC_SUBST(JUDYLIB) AC_SUBST(DBILIB) AC_SUBST(LIBTOOL) +AC_SUBST(MAALIB) AC_SUBST(SYSCONFDIR) AC_SUBST(BINDIR)