apache-mod_mono-apu-config.patch

   1 --- mod_mono-1.2.1/configure.in.orig    2006-11-21 23:24:50.000000000 +0100
   2 +++ mod_mono-1.2.1/configure.in 2007-02-17 17:55:31.519007163 +0100
   3 @@ -82,6 +82,28 @@
   4    fi
   5  ],)
   6
   7 +# check for --with-apu-config
   8 +AC_ARG_WITH(apu-config,
   9 +[  --with-apu-config=PATH  Path to apr-config (apache 2.0). You may use
  10 +                          this option when apu-config is not in the same
  11 +                         directory as apxs and the output of
  12 +                         'apu-config --includes' is different from
  13 +                         'apxs -q INCLUDEDIR'.
  14 +],
  15 +[
  16 +  if test -x "$withval"
  17 +  then
  18 +    AC_MSG_RESULT([$withval executable, good])
  19 +    APUCONFIG=$withval
  20 +  else
  21 +    if test "xno" = "x$withval" ; then
  22 +       AC_MSG_RESULT([no])
  23 +    else
  24 +        AC_MSG_ERROR([$withval not found or not executable])
  25 +    fi
  26 +  fi
  27 +],)
  28 +
  29  if test -z "$APXS"; then
  30    for mydir in /usr/local/apache2/sbin \
  31                 /usr/local/apache2/bin  \
  32 @@ -169,6 +191,48 @@
  33    AC_PATH_PROG(APRCONFIG, apr-config)
  34  fi
  35
  36 +if test -z "$APUCONFIG"; then
  37 +  for mydir in `dirname ${APXS}` \
  38 +               /usr/local/apache2/sbin \
  39 +               /usr/local/apache2/bin  \
  40 +               /usr/local/apache/sbin  \
  41 +               /usr/local/apache/bin   \
  42 +               /usr/sbin               \
  43 +               /usr/bin
  44 +  do
  45 +       AC_MSG_CHECKING(for apu-1-config in $mydir)
  46 +       A1="$mydir/apu-1-config"
  47 +       if test -x "$A1" ; then
  48 +               APUCONFIG="$A1"
  49 +               AC_MSG_RESULT(found.)
  50 +               break
  51 +       else
  52 +               AC_MSG_RESULT(no)
  53 +       fi
  54 +
  55 +       AC_MSG_CHECKING(for apu-config in $mydir)
  56 +       A2="$mydir/apu-config"
  57 +       if test -x "$A2" ; then
  58 +               APUCONFIG="$A2"
  59 +               AC_MSG_RESULT(found.)
  60 +               break
  61 +       else
  62 +               AC_MSG_RESULT(no)
  63 +       fi
  64 +
  65 +  done
  66 +fi
  67 +
  68 +# last resort 1
  69 +if test -z "$APUCONFIG"; then
  70 +  AC_PATH_PROG(APUCONFIG, apu-1-config)
  71 +fi
  72 +
  73 +# last resort 2
  74 +if test -z "$APUCONFIG"; then
  75 +  AC_PATH_PROG(APUCONFIG, apu-config)
  76 +fi
  77 +
  78  APXS_LIBEXECDIR=`${APXS} -q LIBEXECDIR`
  79  APXS_SYSCONFDIR=`${APXS} -q SYSCONFDIR`
  80  AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`"
  81 @@ -183,6 +247,10 @@
  82         CFLAGS="$CFLAGS `$APRCONFIG --includes --cflags`"
  83         CPPFLAGS="$CFLAGS $CPPFLAGS `$APRCONFIG --includes --cflags --cppflags`"
  84  fi
  85 +if test -x "$APUCONFIG" ; then
  86 +       CFLAGS="$CFLAGS `$APUCONFIG --includes`"
  87 +       CPPFLAGS="$CFLAGS $CPPFLAGS `$APUCONFIG --includes`"
  88 +fi
  89  AC_MSG_CHECKING([Apache version])
  90  AC_TRY_COMPILE([
  91         #include <ap_release.h>
  92 @@ -354,6 +422,7 @@
  93  echo "   * apxs = $APXS"
  94  test ! "$APACHE_VER" = "1.3" -a -x "$APRCONFIG" && \
  95  echo "   * apr-config = $APRCONFIG"
  96 +echo "   * apu-config = $APUCONFIG"
  97  echo "   * Verbose logging (debug) = $enable_debug"
  98  echo "   * mono prefix = $MONO_PREFIX"
  99  echo "   * Default MonoApplicationsConfigDir = $DFLT_MONO_CONFIG_DIR"