68c84b
diff -ru httpd-2.4.52.orig/configure httpd-2.4.52/configure
68c84b
--- httpd-2.4.52.orig/configure	2021-12-16 14:49:07.000000000 +0100
68c84b
+++ httpd-2.4.52/configure	2022-02-18 17:49:53.294104051 +0100
68c84b
@@ -6530,123 +6530,7 @@
68c84b
   export CC; export CPP
68c84b
 fi
68c84b
 
68c84b
-
68c84b
-# Check whether --with-pcre was given.
68c84b
-if test ${with_pcre+y}
68c84b
-then :
68c84b
-  withval=$with_pcre;
68c84b
-fi
68c84b
-
68c84b
-
68c84b
-# Extract the first word of "pcre-config", so it can be a program name with args.
68c84b
-set dummy pcre-config; ac_word=$2
68c84b
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
68c84b
-printf %s "checking for $ac_word... " >&6; }
68c84b
-if test ${ac_cv_path_PCRE_CONFIG+y}
68c84b
-then :
68c84b
-  printf %s "(cached) " >&6
68c84b
-else $as_nop
68c84b
-  case $PCRE_CONFIG in
68c84b
-  [\\/]* | ?:[\\/]*)
68c84b
-  ac_cv_path_PCRE_CONFIG="$PCRE_CONFIG" # Let the user override the test with a path.
68c84b
-  ;;
68c84b
-  *)
68c84b
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
68c84b
-for as_dir in $PATH
68c84b
-do
68c84b
-  IFS=$as_save_IFS
68c84b
-  case $as_dir in #(((
68c84b
-    '') as_dir=./ ;;
68c84b
-    */) ;;
68c84b
-    *) as_dir=$as_dir/ ;;
68c84b
-  esac
68c84b
-    for ac_exec_ext in '' $ac_executable_extensions; do
68c84b
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
68c84b
-    ac_cv_path_PCRE_CONFIG="$as_dir$ac_word$ac_exec_ext"
68c84b
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
68c84b
-    break 2
68c84b
-  fi
68c84b
-done
68c84b
-  done
68c84b
-IFS=$as_save_IFS
68c84b
-
68c84b
-  test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="false"
68c84b
-  ;;
68c84b
-esac
68c84b
-fi
68c84b
-PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG
68c84b
-if test -n "$PCRE_CONFIG"; then
68c84b
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PCRE_CONFIG" >&5
68c84b
-printf "%s\n" "$PCRE_CONFIG" >&6; }
68c84b
-else
68c84b
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
68c84b
-printf "%s\n" "no" >&6; }
68c84b
-fi
68c84b
-
68c84b
-
68c84b
-if test -d "$with_pcre" && test -x "$with_pcre/bin/pcre-config"; then
68c84b
-   PCRE_CONFIG=$with_pcre/bin/pcre-config
68c84b
-elif test -x "$with_pcre"; then
68c84b
-   PCRE_CONFIG=$with_pcre
68c84b
-fi
68c84b
-
68c84b
-if test "$PCRE_CONFIG" != "false"; then
68c84b
-  if $PCRE_CONFIG --version >/dev/null 2>&1; then :; else
68c84b
-    as_fn_error $? "Did not find pcre-config script at $PCRE_CONFIG" "$LINENO" 5
68c84b
-  fi
68c84b
-  case `$PCRE_CONFIG --version` in
68c84b
-  [1-5].*)
68c84b
-    as_fn_error $? "Need at least pcre version 6.0" "$LINENO" 5
68c84b
-    ;;
68c84b
-  esac
68c84b
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using external PCRE library from $PCRE_CONFIG" >&5
68c84b
-printf "%s\n" "$as_me: Using external PCRE library from $PCRE_CONFIG" >&6;}
68c84b
-
68c84b
-  if test "x$PCRE_INCLUDES" = "x"; then
68c84b
-    test "x$silent" != "xyes" && echo "  setting PCRE_INCLUDES to \"`$PCRE_CONFIG --cflags`\""
68c84b
-    PCRE_INCLUDES="`$PCRE_CONFIG --cflags`"
68c84b
-  else
68c84b
-    apr_addto_bugger="`$PCRE_CONFIG --cflags`"
68c84b
-    for i in $apr_addto_bugger; do
68c84b
-      apr_addto_duplicate="0"
68c84b
-      for j in $PCRE_INCLUDES; do
68c84b
-        if test "x$i" = "x$j"; then
68c84b
-          apr_addto_duplicate="1"
68c84b
-          break
68c84b
-        fi
68c84b
-      done
68c84b
-      if test $apr_addto_duplicate = "0"; then
68c84b
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to PCRE_INCLUDES"
68c84b
-        PCRE_INCLUDES="$PCRE_INCLUDES $i"
68c84b
-      fi
68c84b
-    done
68c84b
-  fi
68c84b
-
68c84b
-
68c84b
-  if test "x$PCRE_LIBS" = "x"; then
68c84b
-    test "x$silent" != "xyes" && echo "  setting PCRE_LIBS to \"`$PCRE_CONFIG --libs`\""
68c84b
-    PCRE_LIBS="`$PCRE_CONFIG --libs`"
68c84b
-  else
68c84b
-    apr_addto_bugger="`$PCRE_CONFIG --libs`"
68c84b
-    for i in $apr_addto_bugger; do
68c84b
-      apr_addto_duplicate="0"
68c84b
-      for j in $PCRE_LIBS; do
68c84b
-        if test "x$i" = "x$j"; then
68c84b
-          apr_addto_duplicate="1"
68c84b
-          break
68c84b
-        fi
68c84b
-      done
68c84b
-      if test $apr_addto_duplicate = "0"; then
68c84b
-        test "x$silent" != "xyes" && echo "  adding \"$i\" to PCRE_LIBS"
68c84b
-        PCRE_LIBS="$PCRE_LIBS $i"
68c84b
-      fi
68c84b
-    done
68c84b
-  fi
68c84b
-
68c84b
-else
68c84b
-  as_fn_error $? "pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/" "$LINENO" 5
68c84b
-fi
68c84b
-
68c84b
+  PCRE_LIBS=-lpcre
68c84b
   APACHE_VAR_SUBST="$APACHE_VAR_SUBST PCRE_LIBS"
68c84b
 
68c84b
 
68c84b
@@ -41250,9 +41134,9 @@
68c84b
 
68c84b
 
68c84b
 if test x${apu_found} != xobsolete; then
68c84b
-  AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool --libs`"
68c84b
+  AP_LIBS="$AP_LIBS \-lapr-1 \-laprutil-1"
68c84b
 fi
68c84b
-AP_LIBS="$AP_LIBS `$apr_config --link-libtool --libs`"
68c84b
+AP_LIBS="$AP_LIBS \-lapr-1 \-laprutil-1"
68c84b
 
68c84b
   APACHE_VAR_SUBST="$APACHE_VAR_SUBST AP_LIBS"
68c84b