Integrated helpers/external_acl into the build process

diff --git a/configure.in b/configure.in
index ee82c404be0dc087921a62ae81f93d8d9da53b68..07d51f36ee1a6cd0e3a88df455788d8dc505f150 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.275 2002/07/01 15:51:32 hno Exp $
+dnl  $Id: configure.in,v 1.276 2002/07/06 12:23:12 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AC_INIT(src/main.c)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.6-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.275 $)dnl
+AC_REVISION($Revision: 1.276 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1026,6 +1026,33 @@ AC_ARG_ENABLE(ntlm-fail-open,
   fi
 ])
 
+dnl Select external_acl helpers to build
+EXTERNAL_ACL_HELPERS=
+AC_ARG_ENABLE(external-acl-helpers,
+[  --enable-external-acl-helpers=\"list of helpers\"
+                          This option selects which external_acl helpers to
+                          build and install as part of the normal build
+                          process. For a list of available helpers see the
+                          helpers/external_acl directory.],
+[ case "$enableval" in
+  yes)
+    for helper in $srcdir/helpers/external_acl/*; do
+        if test -f $helper/Makefile.in; then
+            EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS `basename $helper`"
+        fi
+    done
+    ;;
+  no)
+    ;;
+  *)
+    EXTERNAL_ACL_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+  esac
+])
+if test -n "$EXTERNAL_ACL_HELPERS"; then
+    echo "External acl helpers built: $EXTERNAL_ACL_HELPERS"
+fi
+AC_SUBST(EXTERNAL_ACL_HELPERS)
+
 dnl Disable "memPools" code
 AC_ARG_ENABLE(mempools,
 [  --disable-mempools      Disable memPools],
@@ -2272,4 +2299,9 @@ AC_OUTPUT([\
        helpers/ntlm_auth/SMB/Makefile \
        helpers/ntlm_auth/SMB/smbval/Makefile \
        helpers/ntlm_auth/winbind/Makefile \
+       helpers/external_acl/Makefile \
+       helpers/external_acl/ip_user/Makefile \
+       helpers/external_acl/ldap_group/Makefile \
+       helpers/external_acl/unix_group/Makefile \
+       helpers/external_acl/wbinfo_group/Makefile \
 ])

diff --git a/helpers/Makefile.am b/helpers/Makefile.am
index f119960ffeb4dd6ff055b2ae676f13226ce3d792..13f269084121d8d281a9b476e46b3c477c73b2c3 100644 (file)
--- a/helpers/Makefile.am
+++ b/helpers/Makefile.am
@@ -1 +1 @@
-SUBDIRS = basic_auth ntlm_auth digest_auth
+SUBDIRS = basic_auth ntlm_auth digest_auth external_acl

diff --git a/helpers/external_acl/Makefile.am b/helpers/external_acl/Makefile.am
new file mode 100644 (file)
index 0000000..339e552
--- /dev/null
+++ b/helpers/external_acl/Makefile.am
@@ -0,0 +1,7 @@
+#  Makefile for storage modules in the Squid Object Cache server
+#
+#  $Id: Makefile.am,v 1.1 2002/07/06 12:23:13 hno Exp $
+#
+
+DIST_SUBDIRS   = ip_user ldap_group unix_group wbinfo_group
+SUBDIRS                = @EXTERNAL_ACL_HELPERS@

diff --git a/helpers/external_acl/ip_user/Makefile.am b/helpers/external_acl/ip_user/Makefile.am
new file mode 100644 (file)
index 0000000..9fbc277
--- /dev/null
+++ b/helpers/external_acl/ip_user/Makefile.am
@@ -0,0 +1,30 @@
+#
+#  Makefile for the ip_user external_acl helper by Rodrigo Campos
+#
+#  $Id: Makefile.am,v 1.1 2002/07/06 12:23:13 hno Exp $
+#
+#  Uncomment and customize the following to suit your needs:
+#
+
+
+libexec_PROGRAMS = ip_user_check
+
+ip_user_check_SOURCES = \
+       dict.c \
+       ip_user.h \
+       main.c \
+       match.c
+
+
+EXTRA_DIST = \
+       example.conf \
+       example-deny_all_but.conf \
+       license \
+       README
+
+# sysconf_DATA = \
+
+LDADD  = @XTRA_LIBS@
+
+INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
+               -I$(top_srcdir)/src/

diff --git a/helpers/external_acl/ip_user/Makefile.separate b/helpers/external_acl/ip_user/Makefile.separate
new file mode 100644 (file)
index 0000000..e2f38fa
--- /dev/null
+++ b/helpers/external_acl/ip_user/Makefile.separate
@@ -0,0 +1,16 @@
+# $Id: Makefile.separate,v 1.1 2002/07/06 12:23:13 hno Exp $
+CC=gcc
+CFLAGS=-Wall
+LIBS=
+# For Solaris
+# LIBS=-lnsl -lsocket
+
+ip_user_check: ip_user.h dict.o match.c main.c
+                               $(CC) $(CFLAGS) -o ip_user_check dict.o match.c main.c $(LIBS)
+
+dict.o: ip_user.h dict.c
+               $(CC) $(CFLAGS) -c dict.c
+
+clean:
+               rm -f dict.o ip_user_check
+

diff --git a/helpers/external_acl/ldap_group/Makefile.am b/helpers/external_acl/ldap_group/Makefile.am
new file mode 100644 (file)
index 0000000..f27c853
--- /dev/null
+++ b/helpers/external_acl/ldap_group/Makefile.am
@@ -0,0 +1,14 @@
+#
+#  Makefile for the Squid LDAP authentication helper
+#
+#  $Id: Makefile.am,v 1.1 2002/07/06 12:23:14 hno Exp $
+#
+#  Uncomment and customize the following to suit your needs:
+#
+
+libexec_PROGRAMS       = squid_ldap_group
+#man_MANS              = squid_ldap_group.8
+#EXTRA_DIST            = squid_ldap_group.8
+squid_ldap_group_SOURCES       = squid_ldap_match.c
+
+LDADD = -lldap -llber

diff --git a/helpers/external_acl/unix_group/Makefile.am b/helpers/external_acl/unix_group/Makefile.am
new file mode 100644 (file)
index 0000000..bff957d
--- /dev/null
+++ b/helpers/external_acl/unix_group/Makefile.am
@@ -0,0 +1,12 @@
+#
+#  Makefile for the Squid LDAP authentication helper
+#
+#  $Id: Makefile.am,v 1.1 2002/07/06 12:23:14 hno Exp $
+#
+#  Uncomment and customize the following to suit your needs:
+#
+
+libexec_PROGRAMS       = squid_unix_group
+#man_MANS              = squid_unix_group.8
+#EXTRA_DIST            = squid_unix_group.8
+squid_unix_group_SOURCES       = check_group-1.0.c

diff --git a/helpers/external_acl/wbinfo_group/Makefile.am b/helpers/external_acl/wbinfo_group/Makefile.am
new file mode 100644 (file)
index 0000000..f19bbbf
--- /dev/null
+++ b/helpers/external_acl/wbinfo_group/Makefile.am
@@ -0,0 +1,12 @@
+#
+#  Makefile for the Squid LDAP authentication helper
+#
+#  $Id: Makefile.am,v 1.1 2002/07/06 12:23:14 hno Exp $
+#
+#  Uncomment and customize the following to suit your needs:
+#
+
+libexec_SCRIPTS        = wbinfo_group.pl
+#man_MANS              = squid_wbinfo_group.8
+#EXTRA_DIST            = squid_wbinfo_group.8
+EXTRA_DIST             = wbinfo_group.pl