Adds the Global LDADD option and fed according to the platform

This commit is contained in:
Felipe Zimmerle
2015-12-01 17:20:51 -03:00
parent 467c977afc
commit 80b82d3707
4 changed files with 24 additions and 6 deletions

View File

@@ -128,42 +128,52 @@ case $host in
*-*-aix*) *-*-aix*)
echo "Checking platform... Identified as AIX" echo "Checking platform... Identified as AIX"
AC_DEFINE([AIX], [1], [Define if the operating system is AIX]) AC_DEFINE([AIX], [1], [Define if the operating system is AIX])
PLATFORM="AIX"
;; ;;
*-*-hpux*) *-*-hpux*)
echo "Checking platform... Identified as HPUX" echo "Checking platform... Identified as HPUX"
AC_DEFINE([HPUX], [1], [Define if the operating system is HPUX]) AC_DEFINE([HPUX], [1], [Define if the operating system is HPUX])
PLATFORM="HPUX"
;; ;;
*-*-darwin*) *-*-darwin*)
echo "Checking platform... Identified as Macintosh OS X" echo "Checking platform... Identified as Macintosh OS X"
AC_DEFINE([MACOSX], [1], [Define if the operating system is Macintosh OSX]) AC_DEFINE([MACOSX], [1], [Define if the operating system is Macintosh OSX])
PLATFORM="MacOSX"
;; ;;
*-*-linux*) *-*-linux*)
echo "Checking platform... Identified as Linux" echo "Checking platform... Identified as Linux"
AC_DEFINE([LINUX], [1], [Define if the operating system is LINUX]) AC_DEFINE([LINUX], [1], [Define if the operating system is LINUX])
PLATFORM="Linux"
;; ;;
*-*-solaris*) *-*-solaris*)
echo "Checking platform... Identified as Solaris" echo "Checking platform... Identified as Solaris"
AC_DEFINE([SOLARIS], [1], [Define if the operating system is SOLARIS]) AC_DEFINE([SOLARIS], [1], [Define if the operating system is SOLARIS])
PLATFORM="Solaris"
;; ;;
*-*-freebsd*) *-*-freebsd*)
echo "Checking platform... Identified as FreeBSD" echo "Checking platform... Identified as FreeBSD"
AC_DEFINE([FREEBSD], [1], [Define if the operating system is FREEBSD]) AC_DEFINE([FREEBSD], [1], [Define if the operating system is FREEBSD])
PLATFORM="FreeBSD"
;; ;;
*-*-netbsd*) *-*-netbsd*)
echo "Checking platform... Identified as NetBSD" echo "Checking platform... Identified as NetBSD"
AC_DEFINE([NETBSD], [1], [Define if the operating system is NETBSD]) AC_DEFINE([NETBSD], [1], [Define if the operating system is NETBSD])
PLATFORM="NetBSD"
;; ;;
*-*-openbsd*) *-*-openbsd*)
echo "Checking platform... Identified as OpenBSD" echo "Checking platform... Identified as OpenBSD"
AC_DEFINE([OPENBSD], [1], [Define if the operating system is OPENBSD]) AC_DEFINE([OPENBSD], [1], [Define if the operating system is OPENBSD])
PLATFORM="OpenBSD"
;; ;;
*-*-kfreebsd*) *-*-kfreebsd*)
echo "Checking platform... Identified as kFreeBSD, treating as linux" echo "Checking platform... Identified as kFreeBSD, treating as linux"
AC_DEFINE([FREEBSD], [1], [Define if the operating system is FREEBSD]) AC_DEFINE([FREEBSD], [1], [Define if the operating system is FREEBSD])
PLATFORM="kFreeBSD"
;; ;;
*-*-gnu*.*) *-*-gnu*.*)
echo "Checking platform... Identified as HURD, treating as linux" echo "Checking platform... Identified as HURD, treating as linux"
AC_DEFINE([LINUX], [1], [Define if the operating system is LINUX]) AC_DEFINE([LINUX], [1], [Define if the operating system is LINUX])
PLATFORM="HURD"
;; ;;
*) *)
echo "Unknown CANONICAL_HOST $host" echo "Unknown CANONICAL_HOST $host"
@@ -215,6 +225,14 @@ fi
AM_CONDITIONAL([TEST_UTILITIES], [test $buildTestUtilities = true]) AM_CONDITIONAL([TEST_UTILITIES], [test $buildTestUtilities = true])
# General link options
if test "$PLATFORM" != "MacOSX"; then
GLOBAL_LDADD="-lrt"
AC_SUBST(GLOBAL_LDADD)
fi
# Files to be generated via autotools. # Files to be generated via autotools.
AC_CONFIG_FILES([\ AC_CONFIG_FILES([\
Makefile \ Makefile \
@@ -249,7 +267,7 @@ AC_OUTPUT
# Print a fancy summary # Print a fancy summary
echo " " echo " "
echo " " echo " "
echo "ModSecurity - v${MSC_GIT_VERSION}" echo "ModSecurity - v${MSC_GIT_VERSION} for $PLATFORM"
echo " " echo " "
echo " Mandatory dependencies" echo " Mandatory dependencies"
echo -n " + libInjection ...." echo -n " + libInjection ...."

View File

@@ -213,7 +213,7 @@ libmodsecurity_la_CPPFLAGS = \
$(PCRE_CFLAGS) $(PCRE_CFLAGS)
libmodsecurity_la_LIBADD = \ libmodsecurity_la_LIBADD = \
-lrt \ $(GLOBAL_LDADD) \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
@LEXLIB@ \ @LEXLIB@ \

View File

@@ -22,7 +22,7 @@ unit_tests_SOURCES = \
unit/unit_test.cc unit/unit_test.cc
unit_tests_LDADD = \ unit_tests_LDADD = \
-lrt \ $(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
@@ -51,7 +51,7 @@ regression_tests_SOURCES = \
regression/custom_debug_log.cc regression/custom_debug_log.cc
regression_tests_LDADD = \ regression_tests_LDADD = \
-lrt \ $(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \
@@ -78,7 +78,7 @@ rules_optimization_SOURCES = \
optimization/optimization.cc optimization/optimization.cc
rules_optimization_LDADD = \ rules_optimization_LDADD = \
-lrt \ $(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \

View File

@@ -6,7 +6,7 @@ benchmark_SOURCES = \
benchmark.cc benchmark.cc
benchmark_LDADD = \ benchmark_LDADD = \
-lrt \ $(GLOBAL_LDADD) \
$(top_builddir)/src/.libs/libmodsecurity.a \ $(top_builddir)/src/.libs/libmodsecurity.a \
$(CURL_LDADD) \ $(CURL_LDADD) \
$(GEOIP_LDFLAGS) $(GEOIP_LDADD) \ $(GEOIP_LDFLAGS) $(GEOIP_LDADD) \