httpd-apreq-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r380927 - in /httpd/apreq/branches/apr-build-system: ./ apreq2-config.in build/find_apreq.m4 buildconf module/apache2/Makefile.in module/apache2/config.m4
Date Sat, 25 Feb 2006 13:16:57 GMT
Author: joes
Date: Sat Feb 25 05:16:50 2006
New Revision: 380927

URL: http://svn.apache.org/viewcvs?rev=380927&view=rev
Log:
Fixes to allow mod_apreq to be built via httpd/modules/apreq.

Added:
    httpd/apreq/branches/apr-build-system/module/apache2/Makefile.in   (with props)
    httpd/apreq/branches/apr-build-system/module/apache2/config.m4   (with props)
Modified:
    httpd/apreq/branches/apr-build-system/   (props changed)
    httpd/apreq/branches/apr-build-system/apreq2-config.in
    httpd/apreq/branches/apr-build-system/build/find_apreq.m4
    httpd/apreq/branches/apr-build-system/buildconf

Propchange: httpd/apreq/branches/apr-build-system/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 25 05:16:50 2006
@@ -6,3 +6,4 @@
 .make.dirs
 Makefile
 apreq2-config
+apreq2-config.out

Modified: httpd/apreq/branches/apr-build-system/apreq2-config.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/apreq2-config.in?rev=380927&r1=380926&r2=380927&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/apreq2-config.in (original)
+++ httpd/apreq/branches/apr-build-system/apreq2-config.in Sat Feb 25 05:16:50 2006
@@ -101,7 +101,7 @@
 if test "$location" = "installed"; then
     LA_FILE="$libdir/lib${APREQ_LIBNAME}.la"
 else
-    LA_FILE="$thisdir/library/lib${APREQ_LIBNAME}.la"
+    LA_FILE="$thisdir/lib${APREQ_LIBNAME}.la"
 fi
 
 flags=""

Modified: httpd/apreq/branches/apr-build-system/build/find_apreq.m4
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/build/find_apreq.m4?rev=380927&r1=380926&r2=380927&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/build/find_apreq.m4 (original)
+++ httpd/apreq/branches/apr-build-system/build/find_apreq.m4 Sat Feb 25 05:16:50 2006
@@ -1,5 +1,5 @@
 dnl -------------------------------------------------------- -*- autoconf -*-
-dnl Copyright 2002-2005 The Apache Software Foundation or its licensors, as
+dnl Copyright 2002-2006 The Apache Software Foundation or its licensors, as
 dnl applicable.
 dnl
 dnl Licensed under the Apache License, Version 2.0 (the "License");
@@ -68,8 +68,8 @@
 dnl value of apu_config to fetch any necessary build/link information.
 dnl
 
-AC_DEFUN([APR_FIND_APU], [
-  apu_found="no"
+AC_DEFUN([APR_FIND_APREQ], [
+  apreq_found="no"
 
   if test "$target_os" = "os2-emx"; then
     # Scripts don't pass test -x on OS/2
@@ -80,68 +80,68 @@
 
   ifelse([$4], [],
   [
-    ifdef(AC_WARNING,([$0: missing argument 4 (acceptable-majors): Defaulting to APU 0.x
then APU 1.x]))
+    ifdef(AC_WARNING,([$0: missing argument 4 (acceptable-majors): Defaulting to APREQ 0.x
then APREQ 1.x]))
     acceptable_majors="0 1"
   ], [acceptable_majors="$4"])
 
-  apu_temp_acceptable_apu_config=""
-  for apu_temp_major in $acceptable_majors
+  apreq_temp_acceptable_apreq_config=""
+  for apreq_temp_major in $acceptable_majors
   do
-    case $apu_temp_major in
+    case $apreq_temp_major in
       0)
-      apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-config"
+      apreq_temp_acceptable_apreq_config="$apreq_temp_acceptable_apreq_config apreq-config"
       ;;
       *)
-      apu_temp_acceptable_apu_config="$apu_temp_acceptable_apu_config apu-$apu_temp_major-config"
+      apreq_temp_acceptable_apreq_config="$apreq_temp_acceptable_apreq_config apreq$apreq_temp_major-config"
       ;;
     esac
   done
 
-  AC_MSG_CHECKING(for APR-util)
-  AC_ARG_WITH(apr-util,
-  [  --with-apr-util=PATH    prefix for installed APU, path to APU build tree,
-                          or the full path to apu-config],
+  AC_MSG_CHECKING(for APREQ)
+  AC_ARG_WITH(apreq,
+  [  --with-apreq=PATH    prefix for installed APREQ, path to APREQ build tree,
+                          or the full path to apreq-config],
   [
     if test "$withval" = "no" || test "$withval" = "yes"; then
-      AC_MSG_ERROR([--with-apr-util requires a directory or file to be provided])
+      AC_MSG_ERROR([--with-apreq requires a directory or file to be provided])
     fi
 
-    for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+    for apreq_temp_apreq_config_file in $apreq_temp_acceptable_apreq_config
     do
       for lookdir in "$withval/bin" "$withval"
       do
-        if $TEST_X "$lookdir/$apu_temp_apu_config_file"; then
-          apu_found="yes"
-          apu_config="$lookdir/$apu_temp_apu_config_file"
+        if $TEST_X "$lookdir/$apreq_temp_apreq_config_file"; then
+          apreq_found="yes"
+          apreq_config="$lookdir/$apreq_temp_apreq_config_file"
           break 2
         fi
       done
     done
 
-    if test "$apu_found" != "yes" && $TEST_X "$withval" && $withval --help
> /dev/null 2>&1 ; then
-      apu_found="yes"
-      apu_config="$withval"
+    if test "$apreq_found" != "yes" && $TEST_X "$withval" && $withval --help
> /dev/null 2>&1 ; then
+      apreq_found="yes"
+      apreq_config="$withval"
     fi
 
-    dnl if --with-apr-util is used, it is a fatal error for its argument
+    dnl if --with-apreq is used, it is a fatal error for its argument
     dnl to be invalid
-    if test "$apu_found" != "yes"; then
-      AC_MSG_ERROR([the --with-apr-util parameter is incorrect. It must specify an install
prefix, a build directory, or an apu-config file.])
+    if test "$apreq_found" != "yes"; then
+      AC_MSG_ERROR([the --with-apreq parameter is incorrect. It must specify an install prefix,
a build directory, or an apreq-config file.])
     fi
   ],[
     if test -n "$3" && test "$3" = "1"; then
-      for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+      for apreq_temp_apreq_config_file in $apreq_temp_acceptable_apreq_config
       do
-        if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
-          apu_found="yes"
-          apu_config="$apu_temp_apu_config_file"
+        if $apreq_temp_apreq_config_file --help > /dev/null 2>&1 ; then
+          apreq_found="yes"
+          apreq_config="$apreq_temp_apreq_config_file"
           break
         else
           dnl look in some standard places (apparently not in builtin/default)
           for lookdir in /usr /usr/local /usr/local/apr /opt/apr /usr/local/apache2 ; do
-            if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
-              apu_found="yes"
-              apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+            if $TEST_X "$lookdir/bin/$apreq_temp_apreq_config_file"; then
+              apreq_found="yes"
+              apreq_config="$lookdir/bin/$apreq_temp_apreq_config_file"
               break 2
             fi
           done
@@ -149,28 +149,28 @@
       done
     fi
     dnl if we have not found anything yet and have bundled source, use that
-    if test "$apu_found" = "no" && test -d "$1"; then
-      apu_temp_abs_srcdir="`cd $1 && pwd`"
-      apu_found="reconfig"
-      apu_bundled_major="`sed -n '/#define.*APU_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
\"$1/include/apu_version.h\"`"
-      case $apu_bundled_major in
+    if test "$apreq_found" = "no" && test -d "$1"; then
+      apreq_temp_abs_srcdir="`cd $1 && pwd`"
+      apreq_found="reconfig"
+      apreq_bundled_major="`sed -n '/#define.*APREQ_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
\"$1/include/apreq_version.h\"`"
+      case $apreq_bundled_major in
         "")
-          AC_MSG_ERROR([failed to find major version of bundled APU])
+          AC_MSG_ERROR([failed to find major version of bundled APREQ])
         ;;
         0)
-          apu_temp_apu_config_file="apu-config"
+          apreq_temp_apreq_config_file="apreq-config"
         ;;
         *)
-          apu_temp_apu_config_file="apu-$apu_bundled_major-config"
+          apreq_temp_apreq_config_file="apreq$apreq_bundled_major-config"
         ;;
       esac
       if test -n "$2"; then
-        apu_config="$2/$apu_temp_apu_config_file"
+        apreq_config="$2/$apreq_temp_apreq_config_file"
       else
-        apu_config="$1/$apu_temp_apu_config_file"
+        apreq_config="$1/$apreq_temp_apreq_config_file"
       fi
     fi
   ])
 
-  AC_MSG_RESULT($apu_found)
+  AC_MSG_RESULT($apreq_found)
 ])

Modified: httpd/apreq/branches/apr-build-system/buildconf
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/buildconf?rev=380927&r1=380926&r2=380927&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/buildconf (original)
+++ httpd/apreq/branches/apr-build-system/buildconf Sat Feb 25 05:16:50 2006
@@ -83,7 +83,7 @@
 #
 # Generate the autoconf header (include/apreq_config.h) and ./configure
 #
-echo "Creating include/private/apreq_config.h ..."
+echo "Creating include/apreq_config.h ..."
 ${AUTOHEADER:-autoheader}
 
 echo "Creating configure ..."

Added: httpd/apreq/branches/apr-build-system/module/apache2/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/module/apache2/Makefile.in?rev=380927&view=auto
==============================================================================
--- httpd/apreq/branches/apr-build-system/module/apache2/Makefile.in (added)
+++ httpd/apreq/branches/apr-build-system/module/apache2/Makefile.in Sat Feb 25 05:16:50 2006
@@ -0,0 +1,3 @@
+
+include $(top_srcdir)/build/special.mk
+

Propchange: httpd/apreq/branches/apr-build-system/module/apache2/Makefile.in
------------------------------------------------------------------------------
    svn:eol-style = native

Added: httpd/apreq/branches/apr-build-system/module/apache2/config.m4
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/module/apache2/config.m4?rev=380927&view=auto
==============================================================================
--- httpd/apreq/branches/apr-build-system/module/apache2/config.m4 (added)
+++ httpd/apreq/branches/apr-build-system/module/apache2/config.m4 Sat Feb 25 05:16:50 2006
@@ -0,0 +1,14 @@
+dnl modules enabled in this directory by default
+
+dnl Authentication (authn), Access, and Authorization (authz)
+
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
+
+APACHE_MODPATH_INIT(apreq)
+
+dnl Authentication modules; modules checking a username and password against a
+dnl file, database, or other similar magic.
+dnl
+APACHE_MODULE(apreq, apreq POST-data filter, filter.lo handle.lo, , yes)
+
+APACHE_MODPATH_FINISH

Propchange: httpd/apreq/branches/apr-build-system/module/apache2/config.m4
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message