MFH: Fixed bug #21224 (apache configure fails when using --enable-versioning)

diff --git a/configure.in b/configure.in
index 97f86b454e85f83f8acada6acd0fda2455c8e827..2c123e3a3b63be7e4d593437e6e34b4edc60b6b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -779,8 +779,12 @@ PHP_HELP_SEPARATOR([Other settings:])
 AC_MSG_CHECKING([whether to enable versioning])
 AC_ARG_ENABLE(versioning,
 [  --enable-versioning     Export only required symbols.
-                          See INSTALL for more information],[
-  PHP_VERSIONING=$enableval
+                          See INSTALL for more information], [
+  if test "x$APXS" != "x"; then
+    PHP_VERSIONING=$enableval
+  else
+    PHP_VERSIONING=no
+  fi
 ],[
   PHP_VERSIONING=no
 ])
@@ -789,7 +793,7 @@ AC_MSG_RESULT([$PHP_VERSIONING])
 if test "$PHP_VERSIONING" = "yes"; then
   test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
   if test -f "$PHP_SYM_FILE"; then
-    EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE"
+    EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE $EXTRA_LDFLAGS"
   fi
 fi