fielding 01/05/17 19:35:53
Modified: . configure.in
build rules.mk.in
Log:
Get the compile flag types right and in order.
Revision Changes Path
1.309 +4 -3 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- configure.in 2001/05/15 12:45:00 1.308
+++ configure.in 2001/05/18 02:35:51 1.309
@@ -96,7 +96,7 @@
# Use a custom-made libtool replacement
echo "using aplibtool"
LIBTOOL="$srcdir/build/aplibtool"
- gcc $CPPFLAGS $CFLAGS -o $LIBTOOL.exe $LIBTOOL.c
+ gcc $CFLAGS $CPPFLAGS -o $LIBTOOL.exe $LIBTOOL.c
;;
*) dnl libtoolize requires that the following not be indented
AC_PROG_LIBTOOL
@@ -141,14 +141,15 @@
])dnl
AC_ARG_ENABLE(maintainer-mode,[ --enable-maintainer-mode Turn on debugging
and compile time warnings],
- [APR_ADDTO(CFLAGS,-g -DAPR_ASSERT_MEMORY)
+ [APR_ADDTO(NOTEST_CPPFLAGS,-DAPR_ASSERT_MEMORY)
+ APR_ADDTO(CFLAGS,-g)
if test "$GCC" = "yes"; then
APR_ADDTO(CFLAGS,[-Wall -Wmissing-prototypes -Wstrict-prototypes
-Wmissing-declarations])
fi
])dnl
AC_ARG_ENABLE(assert-memory,[ --enable-assert-memory Turn on asserts in the
APR memory code],
- [APR_ADDTO(CFLAGS,-DAPR_ASSERT_MEMORY)
+ [APR_ADDTO(NOTEST_CPPFLAGS,-DAPR_ASSERT_MEMORY)
])
dnl # this is the place to put specific options for platform/compiler
1.17 +5 -5 apr/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr/build/rules.mk.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rules.mk.in 2001/05/17 23:15:14 1.16
+++ rules.mk.in 2001/05/18 02:35:52 1.17
@@ -73,8 +73,8 @@
# compilation and linking flags that are supposed to be set only by the user.
# configure adds to them for tests, but we restore them at the end.
#
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -82,8 +82,8 @@
# anything added to the standard flags by configure is moved to EXTRA_*
# at the end of the process.
#
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -92,8 +92,8 @@
# causing them to be used in configure tests (necessary for things like
# -Werror and other strict warnings that maintainers like to use).
#
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -102,8 +102,8 @@
# Note that includes are listed after the flags because -I options have
# left-to-right precedence and CPPFLAGS may include user-defined overrides.
#
-ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
ALL_CFLAGS = $(EXTRA_CFLAGS) $(NOTEST_CFLAGS) $(CFLAGS)
+ALL_CPPFLAGS = $(DEFS) $(EXTRA_CPPFLAGS) $(NOTEST_CPPFLAGS) $(CPPFLAGS)
ALL_LDFLAGS = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS)
ALL_LIBS = $(LIBS) $(NOTEST_LIBS) $(EXTRA_LIBS)
ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
@@ -114,7 +114,7 @@
#
# Basic macro setup
#
-COMPILE = $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(ALL_INCLUDES)
+COMPILE = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
LT_COMPILE = @lt_compile@
LINK = @link@
