diff options
| author | Roy T. Fielding <fielding@apache.org> | 2001-04-29 07:24:11 +0200 |
|---|---|---|
| committer | Roy T. Fielding <fielding@apache.org> | 2001-04-29 07:24:11 +0200 |
| commit | f1f5f01fdbacc32f785df43b94acfd6d6dbdfe4b (patch) | |
| tree | 8ef14138ddf6b62c758dca169f8a348c9de1792e /acinclude.m4 | |
| parent | Pass the perms arg to apr_dbm_open (diff) | |
| download | apache2-f1f5f01fdbacc32f785df43b94acfd6d6dbdfe4b.tar.xz apache2-f1f5f01fdbacc32f785df43b94acfd6d6dbdfe4b.zip | |
Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables. Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM. Fix the setting
of INCLUDES and EXTRA_INCLUDES. Check flags as they are added to
avoid pointless duplications. Fix the order in which flags are given
on the compile and link lines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8832270546..b63ca248de 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -54,21 +54,32 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ APACHE_SUBST(prefix) APACHE_SUBST(AWK) APACHE_SUBST(CC) - APACHE_SUBST(CFLAGS) - APACHE_SUBST(CPPFLAGS) APACHE_SUBST(CXX) + APACHE_SUBST(CPPFLAGS) + APACHE_SUBST(CFLAGS) APACHE_SUBST(CXXFLAGS) APACHE_SUBST(LTFLAGS) APACHE_SUBST(LDFLAGS) APACHE_SUBST(SH_LDFLAGS) APACHE_SUBST(HTTPD_LDFLAGS) + APACHE_SUBST(LIBS) APACHE_SUBST(DEFS) + APACHE_SUBST(INCLUDES) + APACHE_SUBST(NOTEST_CPPFLAGS) + APACHE_SUBST(NOTEST_CFLAGS) + APACHE_SUBST(NOTEST_CXXFLAGS) + APACHE_SUBST(NOTEST_LDFLAGS) + APACHE_SUBST(NOTEST_LIBS) + APACHE_SUBST(EXTRA_CPPFLAGS) + APACHE_SUBST(EXTRA_CFLAGS) + APACHE_SUBST(EXTRA_CXXFLAGS) + APACHE_SUBST(EXTRA_LDFLAGS) + APACHE_SUBST(EXTRA_LIBS) + APACHE_SUBST(EXTRA_INCLUDES) APACHE_SUBST(LIBTOOL) APACHE_SUBST(SHELL) APACHE_SUBST(MODULE_DIRS) APACHE_SUBST(PORT) - APACHE_SUBST(NOTEST_CFLAGS) - APACHE_SUBST(NOTEST_LDFLAGS) APACHE_SUBST(CORE_IMPLIB_FILE) APACHE_SUBST(CORE_IMPLIB) APACHE_SUBST(SH_LIBTOOL) @@ -103,17 +114,6 @@ AC_DEFUN(APACHE_OUTPUT, [ ]) dnl -dnl AC_ADD_LIBRARY(library) -dnl -dnl add a library to the link line -dnl -AC_DEFUN(AC_ADD_LIBRARY,[ - APACHE_ONCE(LIBRARY, $1, [ - EXTRA_LIBS="$EXTRA_LIBS -l$1" - ]) -]) - -dnl dnl AC_CHECK_DEFINE(macro, headerfile) dnl dnl checks for the macro in the header file |