Commit 647470b5 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Per suggestion, tuck NOTEST_* in config_vars.mk. Yep, I changed 

the name. NONAC_* causes autoconf to complain loud and long.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87660 13f79535-47bb-0310-9956-ffa450edef68
parent 4bccde1e

acinclude.m4

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  APACHE_SUBST(SHELL)

  APACHE_SUBST(MODULE_DIRS)

  APACHE_SUBST(PORT)

  APACHE_SUBST(NOTEST_CFLAGS)

  APACHE_SUBST(NOTEST_LDFLAGS)



  abs_srcdir="`(cd $srcdir && pwd)`"

build/fastgen.sh

+0 −4
Original line number Diff line number Diff line
@@ -87,8 +87,6 @@ top_builddir = $top_builddir 
srcdir       = $top_srcdir/$dir

builddir     = $top_builddir/$dir

VPATH        = $top_srcdir/$dir

NONAC_CFLAGS  = $NONAC_CFLAGS

NONAC_LDFLAGS = $NONAC_LDFLAGS

EOF

    

    test -z "$dir" && dir="."
@@ -106,8 +104,6 @@ top_builddir = $top_builddir 
srcdir       = $top_srcdir/$dir

builddir     = $top_builddir/$dir

VPATH        = $top_srcdir/$dir

NONAC_CFLAGS  = $NONAC_CFLAGS

NONAC_LDFLAGS = $NONAC_LDFLAGS

EOF

  

    test -z "$dir" && dir="."

build/rules.mk

+4 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ include $(top_builddir)/config_vars.mk 
# Compile commands



COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)

COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(NONAC_CFLAGS)

COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) $(NOTEST_CFLAGS)

CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)



SH_COMPILE     = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
@@ -70,9 +70,9 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@ 


# Link-related commands



LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@

SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@

MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) $(NONAC_LDFLAGS) -o $@

LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@

SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@

MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) $(NOTEST_LDFLAGS) -o $@



# Cross compile commands