diff options
| author | Jim Jagielski <jim@apache.org> | 2013-12-23 17:08:36 +0100 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2013-12-23 17:08:36 +0100 |
| commit | 6afe8c81728b6b4825f2f631f2b46511da7ce4ca (patch) | |
| tree | 0b39c8d69cc2abac67867524453a6ff9ee33e5d2 /configure.in | |
| parent | Oops... revert (diff) | |
| download | apache2-6afe8c81728b6b4825f2f631f2b46511da7ce4ca.tar.xz apache2-6afe8c81728b6b4825f2f631f2b46511da7ce4ca.zip | |
Allow user to explicitly determine whether or not BSD syntax
makefiles should be created... The default is NO unless we
are on a *BSD* system, in which case we actually see if
'make' is gmake or not.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553134 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 51 |
1 files changed, 35 insertions, 16 deletions
diff --git a/configure.in b/configure.in index 074cfd14b4..937cd441f4 100644 --- a/configure.in +++ b/configure.in @@ -865,6 +865,15 @@ if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then [Allow IPv4 connections on IPv6 listening sockets]) fi +AC_ARG_ENABLE(bsd-makefiles,APACHE_HELP_STRING(--enable-bsd-makefiles,use BSD Makefile syntax), +[ + FORCE_BSD_MAKEFILE=$enableval + AC_MSG_NOTICE([Setting "FORCE_BSD_MAKEFILE" to $FORCE_BSD_MAKEFILE]) +], +[ + FORCE_BSD_MAKEFILE="auto" +]) + APACHE_FAST_OUTPUT(Makefile modules/Makefile srclib/Makefile) APACHE_FAST_OUTPUT(os/Makefile server/Makefile) APACHE_FAST_OUTPUT(support/Makefile) @@ -911,27 +920,37 @@ AC_SUBST(perlbin) dnl If we are running on a BSD variant, see if we need to use the BSD .include syntax. -BSD_MAKEFILE=no ap_make_include=include ap_make_ifdef=ifdef ap_make_else=else ap_make_endif=endif ap_make_delimiter=' ' -case $host in -*bsd*) - # Check whether they've installed GNU make - if make --version > /dev/null 2>&1; then - true - else - BSD_MAKEFILE=yes - ap_make_include=.include - ap_make_ifdef=.ifdef - ap_make_else=.else - ap_make_endif=.endif - ap_make_delimiter='"' - fi - ;; -esac +if test "x$FORCE_BSD_MAKEFILE" = "xno"; then + BSD_MAKEFILE=no +elif test "x$FORCE_BSD_MAKEFILE" = "xyes"; then + BSD_MAKEFILE=yes +else + case $host in + *bsd*) + # Check whether they've installed GNU make + if make --version > /dev/null 2>&1; then + BSD_MAKEFILE=no + else + BSD_MAKEFILE=yes + fi + ;; + *) + BSD_MAKEFILE=no + ;; + esac +fi +if test "x$BSD_MAKEFILE" = "xyes"; then + ap_make_include=.include + ap_make_ifdef=.ifdef + ap_make_else=.else + ap_make_endif=.endif + ap_make_delimiter='"' +fi AC_MSG_NOTICE([using BSD Makefile syntax... $BSD_MAKEFILE]) AC_SUBST(ap_make_include) |