From 417afc1671669fc9ba79410546c6ddfe242f2f4a Mon Sep 17 00:00:00 2001
From: Edward Rudd
Date: Tue, 6 Jan 2004 00:45:57 +0000
Subject: fixed SSL cflag inclusion

---
 Makefile.in   | 4 ++--
 m4/mod_ssl.m4 | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7c00d0a..7a77d6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,7 +60,7 @@ all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs:
 	done; \
 
 $(TARGET):
-	@APXS_BIN@ -c -o @PACKAGE_NAME@.la $(INCLUDES) $(CFLAGS) $(LDADD) @DEFS@ $(SOURCES) 
+	@APXS_BIN@ -c -o @PACKAGE_NAME@.la $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) $(LDADD) @DEFS@ $(SOURCES) 
 
 include:
 	rm -rf include
@@ -112,7 +112,7 @@ $(builddir)/.deps: depend
 
 depend: $(SOURCES) $(HEADERS)
 	if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
-		$(CC) -MM -I@APACHE_INCDIR@ $(INCLUDES) -DHAVE_CONFIG_H $(srcdir)/*.c > $(builddir)/.deps || true; \
+		$(CC) -MM -I@APACHE_INCDIR@ @MOD_SSL_CFLAGS@ $(INCLUDES) -DHAVE_CONFIG_H $(srcdir)/*.c > $(builddir)/.deps || true; \
 	fi
 
 include $(builddir)/.deps
diff --git a/m4/mod_ssl.m4 b/m4/mod_ssl.m4
index ddd910f..457548e 100644
--- a/m4/mod_ssl.m4
+++ b/m4/mod_ssl.m4
@@ -13,13 +13,12 @@ AC_ARG_WITH(
 		ssl-inc,
 		[AC_HELP_STRING([--with-ssl-inc=DIR],[Location of SSL header files])],
 		ssl_incdir="$withval",
-		ssl_incdir="/usr/include"
 	)
 
 	if test "$ssl_val" = "yes"; then
 		ac_save_CFLAGS=$CFLAGS
 		ac_save_CPPFLAGS=$CPPFLAGS
-		MOD_SSL_CFLAGS="-I/usr/include/openssl $CFLAGS"
+		MOD_SSL_CFLAGS="-I/usr/include/openssl"
 		if test "x$ssl_incdir" != "x"; then
 			MOD_SSL_CFLAGS="-I$ssl_incdir -I$ssl_incdir/openssl $MOD_SSL_CFLAGS"
 		fi
-- 
cgit