This commit is contained in:
whottgen 2004-09-29 19:32:21 +00:00
parent ae9bf0b4fb
commit 59e2a2d342
20 changed files with 102 additions and 62 deletions

View File

@ -1,4 +1,2 @@
BUILD_SUBDIRS = . libsmmapdfw smmapd modules/test modules/verify modules/cyrus
SUBDIRS = $(BUILD_SUBDIRS)
DIST_SUBDIRS = $(BUILD_SUBDIRS)
SUBDIRS = libsmmapdfw smmapd verify test

View File

@ -85,10 +85,9 @@ RANLIB = @RANLIB@
RC = @RC@
STRIP = @STRIP@
VERSION = @VERSION@
verify_BUILD = @verify_BUILD@
BUILD_SUBDIRS = . libsmmapdfw smmapd modules/test modules/verify modules/cyrus
SUBDIRS = $(BUILD_SUBDIRS)
DIST_SUBDIRS = $(BUILD_SUBDIRS)
SUBDIRS = libsmmapdfw smmapd verify test
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
@ -290,7 +289,7 @@ distdir: $(DISTFILES)
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
for subdir in $(DIST_SUBDIRS); do \
for subdir in $(SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \

42
smmapdfw/configure vendored
View File

@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS'
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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL verify_BUILD LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -18710,6 +18710,35 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.make <<\_ACEOF
all:
@echo 'ac_maketemp="$(MAKE)"'
_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
if test -n "$ac_maketemp"; then
eval ac_cv_prog_make_${ac_make}_set=yes
else
eval ac_cv_prog_make_${ac_make}_set=no
fi
rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
# Checks for libraries.
@ -21189,10 +21218,10 @@ fi
done
verify_BUILD=
ac_config_files="$ac_config_files Makefile libsmmapdfw/Makefile smmapd/Makefile modules/test/Makefile modules/verify/Makefile modules/cyrus/Makefile"
ac_config_files="$ac_config_files Makefile libsmmapdfw/Makefile smmapd/Makefile test/Makefile verify/Makefile cyrus/Makefile"
cat >confcache <<\_ACEOF
@ -21733,9 +21762,9 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"libsmmapdfw/Makefile" ) CONFIG_FILES="$CONFIG_FILES libsmmapdfw/Makefile" ;;
"smmapd/Makefile" ) CONFIG_FILES="$CONFIG_FILES smmapd/Makefile" ;;
"modules/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/test/Makefile" ;;
"modules/verify/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/verify/Makefile" ;;
"modules/cyrus/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/cyrus/Makefile" ;;
"test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"verify/Makefile" ) CONFIG_FILES="$CONFIG_FILES verify/Makefile" ;;
"cyrus/Makefile" ) CONFIG_FILES="$CONFIG_FILES cyrus/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@ -21870,6 +21899,7 @@ s,@F77@,$F77,;t t
s,@FFLAGS@,$FFLAGS,;t t
s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@verify_BUILD@,$verify_BUILD,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF

View File

@ -58,6 +58,7 @@ AC_ARG_WITH(bdb-inc-dir,
# Checks for programs.
AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_MAKE_SET
# Checks for libraries.
AC_CHECK_LIB([dl], [dlopen])
@ -113,9 +114,10 @@ AC_FUNC_SELECT_ARGTYPES
AC_CHECK_FUNCS([inet_ntoa memset select socket strchr strdup strerror strrchr strtol dlopen dlsym dlerror], [],
[AC_MSG_ERROR([*** missing function, we can't go without it])])
dnl verify_BUILD=libverify_worker.la
verify_BUILD=
AC_SUBST(verify_BUILD)
AC_CONFIG_FILES([Makefile libsmmapdfw/Makefile smmapd/Makefile modules/test/Makefile modules/verify/Makefile modules/cyrus/Makefile])
AC_CONFIG_FILES([Makefile libsmmapdfw/Makefile smmapd/Makefile test/Makefile verify/Makefile cyrus/Makefile])
AC_OUTPUT

View File

@ -0,0 +1,6 @@
lib_LTLIBRARIES = @cyrus_BUILD@
EXTRA_LTLIBRARIES = libcyrus_worker.la
libcyrus_worker_la_SOURCES = cyrus_worker.c
libcyrus_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../libsmmapdfw

View File

@ -38,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
@ -85,24 +85,25 @@ RANLIB = @RANLIB@
RC = @RC@
STRIP = @STRIP@
VERSION = @VERSION@
verify_BUILD = @verify_BUILD@
lib_LTLIBRARIES = libcyrus_worker.la
libcyrus_worker_la_SOURCES = cyrus_worker.c
libcyrus_worker_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
libcyrus_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../../libsmmapdfw
INCLUDES = -I../libsmmapdfw
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
libcyrus_worker_la_LDFLAGS =
libcyrus_worker_la_DEPENDENCIES = ../../libsmmapdfw/libsmmapdfw.la
libcyrus_worker_la_DEPENDENCIES = ../libsmmapdfw/libsmmapdfw.la
libcyrus_worker_la_OBJECTS = cyrus_worker.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -124,7 +125,7 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/cyrus/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu cyrus/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -228,14 +229,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = modules/cyrus
subdir = cyrus
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu modules/cyrus/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu cyrus/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \

View File

@ -85,6 +85,7 @@ RANLIB = @RANLIB@
RC = @RC@
STRIP = @STRIP@
VERSION = @VERSION@
verify_BUILD = @verify_BUILD@
include_HEADERS = containers_public.h queue.h smtp.h cfg.h count.h safe_write.h sunos_comp.h dns.h smmapd.h
lib_LTLIBRARIES = libsmmapdfw.la

View File

@ -1,5 +0,0 @@
lib_LTLIBRARIES = libcyrus_worker.la
libcyrus_worker_la_SOURCES = cyrus_worker.c
libcyrus_worker_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../../libsmmapdfw

View File

@ -1,5 +0,0 @@
lib_LTLIBRARIES = libtest_workers.la
libtest_workers_la_SOURCES = test_workers.c
libtest_workers_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../../libsmmapdfw

View File

@ -1,6 +0,0 @@
lib_LTLIBRARIES = libverify_worker.la
libverify_worker_la_SOURCES = verify_worker.c
libverify_worker_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../../libsmmapdfw

View File

@ -85,6 +85,7 @@ RANLIB = @RANLIB@
RC = @RC@
STRIP = @STRIP@
VERSION = @VERSION@
verify_BUILD = @verify_BUILD@
noinst_HEADERS = containers.h
sysconf_DATA = smmapd.ini

View File

@ -0,0 +1,6 @@
lib_LTLIBRARIES = @test_BUILD@
EXTRA_LTLIBRARIES = libtest_workers.la
libtest_workers_la_SOURCES = test_workers.c
libtest_workers_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../libsmmapdfw

View File

@ -38,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
@ -85,24 +85,25 @@ RANLIB = @RANLIB@
RC = @RC@
STRIP = @STRIP@
VERSION = @VERSION@
verify_BUILD = @verify_BUILD@
lib_LTLIBRARIES = libtest_workers.la
libtest_workers_la_SOURCES = test_workers.c
libtest_workers_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
libtest_workers_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../../libsmmapdfw
INCLUDES = -I../libsmmapdfw
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
libtest_workers_la_LDFLAGS =
libtest_workers_la_DEPENDENCIES = ../../libsmmapdfw/libsmmapdfw.la
libtest_workers_la_DEPENDENCIES = ../libsmmapdfw/libsmmapdfw.la
libtest_workers_la_OBJECTS = test_workers.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -124,7 +125,7 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/test/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -228,14 +229,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = modules/test
subdir = test
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu modules/test/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu test/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \

View File

@ -0,0 +1,8 @@
lib_LTLIBRARIES = @verify_BUILD@
EXTRA_LTLIBRARIES = libverify_worker.la
libverify_worker_la_SOURCES = verify_worker.c
libverify_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../libsmmapdfw

View File

@ -38,7 +38,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
@ -85,24 +85,27 @@ RANLIB = @RANLIB@
RC = @RC@
STRIP = @STRIP@
VERSION = @VERSION@
verify_BUILD = @verify_BUILD@
lib_LTLIBRARIES = libverify_worker.la
lib_LTLIBRARIES = @verify_BUILD@
EXTRA_LTLIBRARIES = libverify_worker.la
libverify_worker_la_SOURCES = verify_worker.c
libverify_worker_la_LIBADD = ../../libsmmapdfw/libsmmapdfw.la
libverify_worker_la_LDFLAGS = -rpath /prod/BrklyDB4/current/lib
libverify_worker_la_LIBADD = ../libsmmapdfw/libsmmapdfw.la
INCLUDES = -I../../libsmmapdfw
INCLUDES = -I../libsmmapdfw
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
libverify_worker_la_DEPENDENCIES = ../../libsmmapdfw/libsmmapdfw.la
libverify_worker_la_LDFLAGS =
libverify_worker_la_DEPENDENCIES = ../libsmmapdfw/libsmmapdfw.la
libverify_worker_la_OBJECTS = verify_worker.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -124,7 +127,7 @@ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/verify/Makefile
cd $(top_srcdir) && $(AUTOMAKE) --gnu verify/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
@ -195,7 +198,7 @@ distclean-libtool:
maintainer-clean-libtool:
libverify_worker.la: $(libverify_worker_la_OBJECTS) $(libverify_worker_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libverify_worker_la_LDFLAGS) $(libverify_worker_la_OBJECTS) $(libverify_worker_la_LIBADD) $(LIBS)
$(LINK) $(libverify_worker_la_LDFLAGS) $(libverify_worker_la_OBJECTS) $(libverify_worker_la_LIBADD) $(LIBS)
tags: TAGS
@ -228,14 +231,14 @@ maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = modules/verify
subdir = verify
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu modules/verify/Makefile
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu verify/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \