Build and code fixes

apache2/Makefile.am

@@ -1,38 +1,75 @@
-ACLOCAL_AMFLAGS = -I build
+pkglibdir = $(prefix)/lib
-SUBDIRS = @TOPLEVEL_SUBDIRS@ tests
+pkglib_LTLIBRARIES = mod_security2.la
+#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \
+#                  msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \
+#                  persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \
+#                  msc_lua.h msc_release.h
 
-CLEANFILES =
+mod_security2_la_SOURCES = mod_security2.c \
-MAINTAINERCLEANFILES =
+                           apache2_config.c apache2_io.c apache2_util.c \
+                           re.c re_operators.c re_actions.c re_tfns.c \
+                           re_variables.c msc_logging.c msc_xml.c \
+                           msc_multipart.c modsecurity.c msc_parsers.c \
+                           msc_util.c msc_pcre.c persist_dbm.c msc_reqbody.c \
+                           msc_geo.c msc_gsb.c msc_unicode.c acmp.c msc_lua.c msc_release.c
 
-CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
+mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
-   tests/regression/server_root/logs/*.log
+                          @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@
+mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@
+mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
 
-MAINTAINERCLEANFILES += $(CLEANFILES) \
+if AIX
-       Makefile.in \
+mod_security2_la_LDFLAGS = -module -avoid-version \
-       aclocal.m4 \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-       alp2/Makefile.in \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
-       apache2/Makefile.in \
+endif
-       build/config.guess \
-       build/config.sub \
-       build/depcomp \
-       build/libtool.m4 \
-       build/ltmain.sh \
-       build/ltoptions.m4 \
-       build/ltsugar.m4 \
-       build/ltversion.m4 \
-       build/lt~obsolete.m4 \
-       build/missing \
-       configure \
-       ext/Makefile.in \
-       mlogc/Makefile.in \
-       modsecurity_config_auto.h.in~ \
-       tests/Makefile.in \
-       tools/Makefile.in
 
-# Alias for "check"
+if HPUX
-test: check
+mod_security2_la_LDFLAGS = -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
 
-test-regression:
+if MACOSX
-	(cd tests && $(MAKE) test-regression)
+mod_security2_la_LDFLAGS = -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
 
-.PHONY: test
+if SOLARIS
+mod_security2_la_LDFLAGS = -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
+
+if LINUX
+mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
+
+if FREEBSD
+mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
+
+if OPENBSD
+mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
+
+if NETBSD
+mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
+
+install-exec-hook: $(pkglib_LTLIBRARIES)
+	@echo "Removing unused static libraries..."; \
+	for m in $(pkglib_LTLIBRARIES); do \
+	  base=`echo $$m | sed 's/\..*//'`; \
+	  rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \
+	  cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(APXS_MODULES); \
+	done