Fix --with-apr=/usr and/or --with-apr-util=/usr.

[apache] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 3764327a69853aeaa70c928bce1acf4457f59e5c..38d3993fd62cf37ea256ef70332ebca1d3e2dcd1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -90,8 +90,12 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(DSO_MODULES)
   APACHE_SUBST(APR_BINDIR)
   APACHE_SUBST(APR_INCLUDEDIR)
+  APACHE_SUBST(APR_VERSION)
+  APACHE_SUBST(APR_CONFIG)
   APACHE_SUBST(APU_BINDIR)
   APACHE_SUBST(APU_INCLUDEDIR)
+  APACHE_SUBST(APU_VERSION)
+  APACHE_SUBST(APU_CONFIG)
 
   abs_srcdir="`(cd $srcdir && pwd)`"
 
@@ -170,12 +174,13 @@ AC_DEFUN(APACHE_MODPATH_ADD,[
 
   if test -z "$module_standalone"; then
     if test -z "$2"; then
-      libname="mod_$1.la"
+      # The filename of a convenience library must have a "lib" prefix:
+      libname="libmod_$1.la"
       BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
       modpath_static="$modpath_static $libname"
       cat >>$modpath_current/modules.mk<<EOF
 $libname: $objects
-       \$(MOD_LINK) $objects
+       \$(MOD_LINK) $objects $5
 EOF
     else
       apache_need_shared=yes
@@ -255,7 +260,7 @@ AC_DEFUN(APACHE_MODULE,[
   if test "$enable_$1" != "no"; then
     case "$enable_$1" in
     shared*)
-      enable_$1=`echo $ac_n $enable_$1$ac_c|sed 's/shared,*//'`
+      enable_$1=`echo $enable_$1|sed 's/shared,*//'`
       sharedobjs=yes
       shared=yes
       DSO_MODULES="$DSO_MODULES $1"
@@ -267,7 +272,10 @@ AC_DEFUN(APACHE_MODULE,[
       fi
       shared="";;
     esac
-    APACHE_MODPATH_ADD($1, $shared, $3)
+    define([modprefix], [MOD_]translit($1, [a-z-], [A-Z_]))
+    APACHE_MODPATH_ADD($1, $shared, $3,, [\$(]modprefix[_LDADD)])
+    APACHE_SUBST(modprefix[_LDADD])
+    undefine([modprefix])
   fi
 ])dnl
 
@@ -279,7 +287,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[
   module_default=yes
 
   AC_ARG_ENABLE(modules,
-  APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable),[
+  APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable | "all" | "most"),[
     for i in $enableval; do
       if test "$i" = "all" -o "$i" = "most"; then
         module_selection=$i
@@ -291,7 +299,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[
   ])
   
   AC_ARG_ENABLE(mods-shared,
-  APACHE_HELP_STRING(--enable-mods-shared=MODULE-LIST,Space-separated list of shared modules to enable),[
+  APACHE_HELP_STRING(--enable-mods-shared=MODULE-LIST,Space-separated list of shared modules to enable | "all" | "most"),[
     for i in $enableval; do
       if test "$i" = "all" -o "$i" = "most"; then
         module_selection=$i
@@ -377,6 +385,13 @@ if test "x$ap_ssltk_configured" = "x"; then
       ])
       dnl Look for additional, possibly missing headers
       AC_CHECK_HEADERS(openssl/engine.h)
+      if test -n "$PKGCONFIG"; then
+        $PKGCONFIG openssl
+        if test $? -eq 0; then
+          ap_ssltk_inc="$ap_ssltk_inc `$PKGCONFIG --cflags-only-I openssl`"
+          CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
+        fi
+      fi
     else
       AC_MSG_RESULT([no OpenSSL headers found])
     fi
@@ -461,13 +476,20 @@ if test "x$ap_ssltk_configured" = "x"; then
       APR_ADDTO(LDFLAGS, ["$ap_platform_runtime_link_flag$ap_ssltk_lib"])
     fi
   fi
-  dnl (d) add "-lssl -lcrypto" OR "-lsslc" to LIBS because restoring LIBS
-  dnl after AC_CHECK_LIB() obliterates any flags AC_CHECK_LIB() added.
+  # Put SSL libraries in SSL_LIBS.
   if test "$ap_ssltk_type" = "openssl"; then
-    APR_ADDTO(LIBS, [-lssl -lcrypto])
+    APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])
+    if test -n "$PKGCONFIG"; then
+      $PKGCONFIG openssl
+      if test $? -eq 0; then
+        ap_ssltk_libdep=`$PKGCONFIG --libs openssl`
+        APR_ADDTO(SSL_LIBS, $ap_ssltk_libdep)
+      fi
+    fi
   else
-    APR_ADDTO(LIBS, [-lsslc])
+    APR_SETVAR(SSL_LIBS, [-lsslc])
   fi
+  APACHE_SUBST(SSL_LIBS)
 fi
 ])