diff options
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | 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: | |||
60 | done; \ | 60 | done; \ |
61 | 61 | ||
62 | $(TARGET): | 62 | $(TARGET): |
63 | @APXS_BIN@ -c -o @PACKAGE_NAME@.la $(INCLUDES) $(CFLAGS) $(LDADD) @DEFS@ $(SOURCES) | 63 | @APXS_BIN@ -c -o @PACKAGE_NAME@.la $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) $(LDADD) @DEFS@ $(SOURCES) |
64 | 64 | ||
65 | include: | 65 | include: |
66 | rm -rf include | 66 | rm -rf include |
@@ -112,7 +112,7 @@ $(builddir)/.deps: depend | |||
112 | 112 | ||
113 | depend: $(SOURCES) $(HEADERS) | 113 | depend: $(SOURCES) $(HEADERS) |
114 | if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \ | 114 | if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \ |
115 | $(CC) -MM -I@APACHE_INCDIR@ $(INCLUDES) -DHAVE_CONFIG_H $(srcdir)/*.c > $(builddir)/.deps || true; \ | 115 | $(CC) -MM -I@APACHE_INCDIR@ @MOD_SSL_CFLAGS@ $(INCLUDES) -DHAVE_CONFIG_H $(srcdir)/*.c > $(builddir)/.deps || true; \ |
116 | fi | 116 | fi |
117 | 117 | ||
118 | include $(builddir)/.deps | 118 | 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( | |||
13 | ssl-inc, | 13 | ssl-inc, |
14 | [AC_HELP_STRING([--with-ssl-inc=DIR],[Location of SSL header files])], | 14 | [AC_HELP_STRING([--with-ssl-inc=DIR],[Location of SSL header files])], |
15 | ssl_incdir="$withval", | 15 | ssl_incdir="$withval", |
16 | ssl_incdir="/usr/include" | ||
17 | ) | 16 | ) |
18 | 17 | ||
19 | if test "$ssl_val" = "yes"; then | 18 | if test "$ssl_val" = "yes"; then |
20 | ac_save_CFLAGS=$CFLAGS | 19 | ac_save_CFLAGS=$CFLAGS |
21 | ac_save_CPPFLAGS=$CPPFLAGS | 20 | ac_save_CPPFLAGS=$CPPFLAGS |
22 | MOD_SSL_CFLAGS="-I/usr/include/openssl $CFLAGS" | 21 | MOD_SSL_CFLAGS="-I/usr/include/openssl" |
23 | if test "x$ssl_incdir" != "x"; then | 22 | if test "x$ssl_incdir" != "x"; then |
24 | MOD_SSL_CFLAGS="-I$ssl_incdir -I$ssl_incdir/openssl $MOD_SSL_CFLAGS" | 23 | MOD_SSL_CFLAGS="-I$ssl_incdir -I$ssl_incdir/openssl $MOD_SSL_CFLAGS" |
25 | fi | 24 | fi |