From d878fce0cebb505632d39feec390ff498ee4351e Mon Sep 17 00:00:00 2001 From: brenosilva Date: Thu, 7 Apr 2011 13:30:55 +0000 Subject: [PATCH] fixes for solaris compilation --- apache2/Makefile.am | 28 +++++++++++++++++++++++++++- apache2/Makefile.in | 22 +++++++++++++++++++--- configure.ac | 4 ++-- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/apache2/Makefile.am b/apache2/Makefile.am index d280034b..6e8f0685 100644 --- a/apache2/Makefile.am +++ b/apache2/Makefile.am @@ -22,7 +22,33 @@ if MACOSX mod_security2_la_LDFLAGS = -module -avoid-version \ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ -else +endif + +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@ diff --git a/apache2/Makefile.in b/apache2/Makefile.in index b71d0afe..ed1a44d9 100644 --- a/apache2/Makefile.in +++ b/apache2/Makefile.in @@ -311,14 +311,30 @@ mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ @LUA_CPPFLAGS@ mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ -@MACOSX_FALSE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ -@MACOSX_FALSE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ -@MACOSX_FALSE@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ +@FREEBSD_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ +@FREEBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ +@FREEBSD_TRUE@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + +@LINUX_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ +@LINUX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ +@LINUX_TRUE@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ @MACOSX_TRUE@mod_security2_la_LDFLAGS = -module -avoid-version \ @MACOSX_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ @MACOSX_TRUE@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ +@NETBSD_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ +@NETBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ +@NETBSD_TRUE@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + +@OPENBSD_TRUE@mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \ +@OPENBSD_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ +@OPENBSD_TRUE@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + +@SOLARIS_TRUE@mod_security2_la_LDFLAGS = -module -avoid-version \ +@SOLARIS_TRUE@ @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \ +@SOLARIS_TRUE@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ + all: all-am .SUFFIXES: diff --git a/configure.ac b/configure.ac index 96d29ea7..4a67428e 100644 --- a/configure.ac +++ b/configure.ac @@ -76,12 +76,12 @@ CANONICAL_HOST=$host #AH_TEMPLATE([AIX], [Define if the operating system is AIX]) AH_TEMPLATE([LINUX], [Define if the operating system is LINUX]) -#AH_TEMPLATE([IRIX], [Define if the operating system is IRIX]) +AH_TEMPLATE([OPENBSD], [Define if the operating system is OpenBSD]) AH_TEMPLATE([SOLARIS], [Define if the operating system is SOLARIS]) #AH_TEMPLATE([HPUX], [Define if the operating system is HPUX]) AH_TEMPLATE([MACOSX], [Define if the operating system is Macintosh OSX]) AH_TEMPLATE([FREEBSD], [Define if the operating system is FREEBSD]) -#AH_TEMPLATE([TRU64], [Define if the operating system is TRU64]) +AH_TEMPLATE([NETBSD], [Define if the operating system is NetBSD]) case $host in