diff -urN ../mod_ssl-2.8.15-1.3.28/configure mod_ssl/configure --- ../mod_ssl-2.8.15-1.3.28/configure Tue Oct 16 05:34:54 2001 +++ mod_ssl/configure Wed Oct 17 21:49:18 2001 @@ -355,11 +355,11 @@ echo "INCDIR=$APXS_INCLUDEDIR" >>$file echo "OSDIR=\$(INCDIR)" >>$file echo "CC=$APXS_CC" >>$file - echo "CFLAGS=-I\$(INCDIR) $APXS_CFLAGS" >>$file - echo "CFLAGS_SHLIB=$APXS_CFLAGS_SHLIB" >>$file + echo "CFLAGS=$CFLAGS -I\$(INCDIR) $APXS_CFLAGS" >>$file + echo "CFLAGS_SHLIB=$CFLAGS $APXS_CFLAGS_SHLIB" >>$file echo "LD_SHLIB=$APXS_LD_SHLIB" >>$file - echo "LDFLAGS=$APXS_LDFLAGS" >>$file - echo "LDFLAGS_SHLIB=$APXS_LDFLAGS_SHLIB" >>$file + echo "LDFLAGS=$LDFLAGS $APXS_LDFLAGS" >>$file + echo "LDFLAGS_SHLIB=$LDFLAGS $APXS_LDFLAGS_SHLIB" >>$file echo "LIBS_SHLIB=$APXS_LIBS_SHLIB" >>$file # define the package locations @@ -390,7 +390,7 @@ echo "all:" >>Makefile echo " -@cd pkg.sslmod; \$(MAKE)" >>Makefile echo "install: all" >>Makefile - echo " -@cd pkg.sslmod; \$(APXS) -i -n ssl_module libssl.so" >>Makefile + echo " -@cd pkg.sslmod; mkdir -p \`\$(APXS) -q LIBEXECDIR\` && \$(APXS) -i -n ssl_module libssl.so" >>Makefile echo "clean:" >>Makefile echo " -@cd pkg.sslmod; \$(MAKE) clean" >>Makefile echo "distclean:" >>Makefile Binary files ../mod_ssl-2.8.15-1.3.28/etc/patch.exe and mod_ssl/etc/patch.exe differ Binary files ../mod_ssl-2.8.15-1.3.28/pkg.contrib/sxnet.tar and mod_ssl/pkg.contrib/sxnet.tar differ diff -urN ../mod_ssl-2.8.15-1.3.28/pkg.sslmod/libssl.module mod_ssl/pkg.sslmod/libssl.module --- ../mod_ssl-2.8.15-1.3.28/pkg.sslmod/libssl.module Fri Oct 4 06:09:50 2002 +++ mod_ssl/pkg.sslmod/libssl.module Wed Oct 16 12:24:19 2002 @@ -389,13 +389,23 @@ fi done if [ ".$SSL_INCDIR" = . ]; then - echo "Error: Cannot find SSL header files in any of the following dirs:" 1>&2 - echo "Error: . /usr/include /usr/include/ssl/ /usr/local/include /usr/local/include/ssl" 1>&2 - exit 1 + for domain in System Local Network; do + if [ -f /$domain/Library/Frameworks/openssl.framework/Headers/ssl.h ]; then + SSL_FRAMEWORK=openssl + fi + done + if [ ".$SSL_FRAMEWORK" = . ]; then + echo "Error: Cannot find SSL header files in any of the following dirs:" 1>&2 + echo "Error: . /usr/include /usr/include/ssl/ /usr/local/include /usr/local/include/ssl" 1>&2 + exit 1 + fi fi else if [ -f "$SSL_BASE/include/openssl/ssl.h" ]; then SSL_INCDIR='$(SSL_BASE)/include' + elif [ -f "$SSL_BASE/Headers/ssl.h" ] && echo "$SSL_BASE" | grep \\.framework > /dev/null; then + SSL_FRAMEWORK=`basename $SSL_BASE` + SSL_FRAMEWORK=`basename $SSL_FRAMEWORK .framework` else echo "Error: Cannot find SSL header files under $SSL_BASE" 1>&2 exit 1 @@ -411,16 +421,20 @@ if [ ".$SSL_BASE" = .SYSTEM ]; then SSL_LIBDIR="" for p in . /lib /usr/lib /usr/local/lib; do - if [ -f "$p/libssl.a" -o -f "$p/libssl.so" ]; then + if [ -f "$p/libssl.a" -o -f "$p/libssl.so" -o -f "$p/libssl.dylib" ]; then SSL_LIBDIR="$p" my_real_ssl_libdir="$p" break fi done if [ ".$SSL_LIBDIR" = . ]; then - echo "Error: Cannot find SSL library files in any of the following dirs:" 1>&2 - echo "Error: . /lib /usr/lib /usr/local/lib" 1>&2 - exit 1 + if [ ".$SSL_FRAMEWORK" != . ]; then + SSL_LDFLAGS="$SSL_LDFLAGS -framework openssl" + else + echo "Error: Cannot find SSL library files in any of the following dirs:" 1>&2 + echo "Error: . /lib /usr/lib /usr/local/lib" 1>&2 + exit 1 + fi fi else if [ -f "$SSL_BASE/libssl.a" -o -f "$SSL_BASE/libssl.so" ]; then @@ -429,13 +443,18 @@ elif [ -f "$SSL_BASE/lib/libssl.a" -o -f "$SSL_BASE/lib/libssl.so" ]; then SSL_LIBDIR='$(SSL_BASE)/lib' my_real_ssl_libdir="$SSL_BASE/lib" + elif [ ".$SSL_FRAMEWORK" != . ] && [ -f "$SSL_BASE/$SSL_FRAMEWORK" ]; then + SSL_LDFLAGS="$SSL_LDFLAGS -framework openssl" else + echo "No $SSL_BASE/$SSL_FRAMEWORK" echo "Error: Cannot find SSL library files under $SSL_BASE" 1>&2 exit 1 fi fi - SSL_LDFLAGS="$SSL_LDFLAGS -L\$(SSL_LIBDIR)" - SSL_LIBS="$SSL_LIBS -lssl -lcrypto" + if [ ".$SSL_LIBDIR" != . ]; then + SSL_LDFLAGS="$SSL_LDFLAGS -L\$(SSL_LIBDIR)" + SSL_LIBS="$SSL_LIBS -lssl -lcrypto" + fi # # SSL installation type