1 files changed, 13 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 9c5e188..6d5a290 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,7 @@ AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 LT_INIT
 
-AC_SUBST([USER_CFLAGS], "$CFLAGS")
-CFLAGS="-Wall -std=gnu99 -g -O2"
+CFLAGS="$CFLAGS -Wall -std=gnu99"
 
 case $host_os in
         *cygwin*)
@@ -33,13 +32,14 @@ case $host_os in
                 ;;
         *hpux*)
                 HOST_OS=hpux;
-                CFLAGS="$CFLAGS -mlp64 -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT"
+                CFLAGS="$CFLAGS -mlp64"
+                CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT"
                 AC_SUBST([PLATFORM_LDADD], ['-lpthread'])
                 ;;
         *linux*)
                 HOST_OS=linux
                 HOST_ABI=elf
-                CFLAGS="$CFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
+                CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
                 ;;
         *netbsd*)
                 HOST_OS=netbsd
@@ -50,14 +50,18 @@ case $host_os in
                 ;;
         *mingw*)
                 HOST_OS=win
-                CFLAGS="$CFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600 -DOPENSSL_NO_SPEED -DNO_SYSLOG -D__USE_MINGW_ANSI_STDIO -static-libgcc"
+                CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO"
+                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS"
+                CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600"
+                CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SPEED -DNO_SYSLOG"
+                CFLAGS="$CFLAGS -static-libgcc"
                 LDFLAGS="$LDFLAGS -static-libgcc"
                 AC_SUBST([PLATFORM_LDADD], ['-lws2_32'])
                 ;;
         *solaris*)
                 HOST_OS=solaris
                 HOST_ABI=elf
-                CFLAGS="$CFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP"
+                CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP"
                 AC_SUBST([PLATFORM_LDADD], ['-lnsl -lsocket'])
                 ;;
         *) ;;
@@ -294,7 +298,7 @@ AC_ARG_ENABLE([extratests],
 AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes])
 
 old_cflags=$CFLAGS
-CFLAGS="$USER_CFLAGS -I$srcdir/include"
+CFLAGS="$CFLAGS -I$srcdir/include"
 AC_MSG_CHECKING([if BSWAP4 builds without __STRICT_ALIGNMENT])
 AC_TRY_COMPILE([#include "$srcdir/crypto/modes/modes_lcl.h"],
                [int a = 0; BSWAP4(a);],
@@ -306,11 +310,11 @@ CFLAGS="$old_cflags"
 
 case $host_cpu in
         *sparc*)
-                CFLAGS="$CFLAGS -D__STRICT_ALIGNMENT"
+                CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT"
                 ;;
         *arm*)
                 AS_IF([test "x$BSWAP4" = "xyes"],,
-                    CFLAGS="$CFLAGS -D__STRICT_ALIGNMENT")
+                    CPPFLAGS="$CPPFLAGS -D__STRICT_ALIGNMENT")
                 ;;
 esac