diff options
| author | fielding <fielding@13f79535-47bb-0310-9956-ffa450edef68> | 2001-05-11 03:59:03 +0000 |
|---|---|---|
| committer | fielding <fielding@13f79535-47bb-0310-9956-ffa450edef68> | 2001-05-11 03:59:03 +0000 |
| commit | bcbdc4c029aa77d03627819b7312390d06776506 (patch) | |
| tree | ba6e6e3e37105226df868c6e6756fb71e0660da6 | |
| parent | 0ae9981e972e46a7115a2e8b673456adbba9f158 (diff) | |
| download | libapr-bcbdc4c029aa77d03627819b7312390d06776506.tar.gz | |
Remove useless cruft and make it unnecessary for clients of APR
to call APR_PRELOAD.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61612 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | APRVARS.in | 2 | ||||
| -rw-r--r-- | build/apr_common.m4 | 3 | ||||
| -rw-r--r-- | build/apr_hints.m4 | 10 |
3 files changed, 4 insertions, 11 deletions
diff --git a/APRVARS.in b/APRVARS.in index 5852a30fa..5459b6585 100644 --- a/APRVARS.in +++ b/APRVARS.in @@ -1,3 +1,5 @@ +CC="@CC@" +SHELL="@SHELL@" EXTRA_CPPFLAGS="@EXTRA_CPPFLAGS@" EXTRA_CFLAGS="@EXTRA_CFLAGS@" EXTRA_LDFLAGS="@EXTRA_LDFLAGS@" diff --git a/build/apr_common.m4 b/build/apr_common.m4 index 9456ffab6..f17b4ed40 100644 --- a/build/apr_common.m4 +++ b/build/apr_common.m4 @@ -14,9 +14,6 @@ AC_DEFUN(APR_CONFIG_NICE,[ # Created by configure EOF - if test -n "$MAKE"; then - echo "MAKE=\"$MAKE\"; export MAKE" >> $1 - fi if test -n "$CFLAGS"; then echo "CFLAGS=\"$CFLAGS\"; export CFLAGS" >> $1 fi diff --git a/build/apr_hints.m4 b/build/apr_hints.m4 index 44e8f425e..f1ea069a2 100644 --- a/build/apr_hints.m4 +++ b/build/apr_hints.m4 @@ -20,13 +20,9 @@ dnl Generally, we force the setting of CC, and add flags dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. dnl AC_DEFUN(APR_PRELOAD, [ -if test "$DID_APR_PRELOAD" = "yes" ; then +if test "x$apr_preload_done" != "xyes" ; then - echo "APR hints file rules for $host already applied" - -else - - DID_APR_PRELOAD="yes"; export DID_APR_PRELOAD + apr_preload_done="yes" echo "Applying APR hints file rules for $host" @@ -39,7 +35,6 @@ else APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE]) APR_ADDTO(LIBS, [-lsocket -lsvipc -lcurses]) APR_ADDTO(LDFLAGS, [-Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\"]) - APR_SETVAR(CAT, [/bin/cat]) ;; *-apple-aux3*) APR_SETVAR(CC, [gcc]) @@ -347,7 +342,6 @@ dnl # Not a problem in 10.20. Otherwise, who knows? *-riscix) APR_ADDTO(CPPFLAGS, [-DRISCIX]) APR_SETIFNULL(CFLAGS, [-O]) - APR_SETIFNULL(MAKE, [make]) ;; *-irix*) APR_ADDTO(CPPFLAGS, [-D_POSIX_THREAD_SAFE_FUNCTIONS]) |