4 files changed, 112 insertions, 61 deletions

diff --git a/INSTALL b/INSTALL
index 4d0a6b5b5..aa93218bb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -133,6 +133,12 @@ transparently.  However, please note the following exceptions:
             added security.  On system using Apache for example, check
             the values for the `Group' option in your httpd.conf file.
 
+      --with-cgi-ext=<extension>
+            Specify an extension for cgi-bin programs.  The CGI
+            wrappers placed in $PREFIX/cgi-bin will have this
+            extension (some Web servers require an extension).
+            <extension> must include the dot.
+
       --with-gcc=no
             Don't use gcc, even if it is found.  `cc' must be found on
             your $PATH
diff --git a/configure b/configure
index a580e49bc..4869e9391 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.16 
+# From configure.in Revision: 1.19 
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.12 
@@ -25,6 +25,9 @@ ac_help="$ac_help
 ac_help="$ac_help
 
 	--with-cgi-gid  	specify GID CGI programs run as"
+ac_help="$ac_help
+
+	--with-cgi-ext  	specify extensions on CGI programs"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -536,15 +539,16 @@ fi
 
 # Set VERSION so we only need to edit it in one place
 
-VERSION=1.0b5
+VERSION=1.0b6
 
 
 # /home/mailman is the default installation directory
 
 
+
 # Check for Python!  Better be found on $PATH
 echo $ac_n "checking for --with-python""... $ac_c" 1>&6
-echo "configure:548: checking for --with-python" >&5
+echo "configure:552: checking for --with-python" >&5
 # Check whether --with-python or --without-python was given.
 if test "${with_python+set}" = set; then
   withval="$with_python"
@@ -558,7 +562,7 @@ then
 	# Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:562: checking for $ac_word" >&5
+echo "configure:566: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_with_python'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -590,7 +594,7 @@ fi
 fi
 
 echo $ac_n "checking Python interpreter""... $ac_c" 1>&6
-echo "configure:594: checking Python interpreter" >&5
+echo "configure:598: checking Python interpreter" >&5
 if test ! -x $with_python
 then
     { echo "configure: error: 
@@ -634,7 +638,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:638: checking for a BSD compatible install" >&5
+echo "configure:642: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -684,7 +688,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:692: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -713,7 +717,7 @@ fi
 
 # Find compiler, allow alternatives to gcc
 echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6
-echo "configure:717: checking for --without-gcc" >&5
+echo "configure:721: checking for --without-gcc" >&5
 # Check whether --with-gcc or --without-gcc was given.
 if test "${with_gcc+set}" = set; then
   withval="$with_gcc"
@@ -742,7 +746,7 @@ fi
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:746: checking for $ac_word" >&5
+echo "configure:750: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -771,7 +775,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:775: checking for $ac_word" >&5
+echo "configure:779: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -819,7 +823,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:823: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:827: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -829,11 +833,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 833 "configure"
+#line 837 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -853,12 +857,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:857: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:861: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:862: checking whether we are using GNU C" >&5
+echo "configure:866: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -867,7 +871,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -882,7 +886,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:886: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:890: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -930,7 +934,7 @@ fi
 # Pull the hash mark out of the macro call to avoid m4 problems.
 ac_msg="whether #! works in shell scripts"
 echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
-echo "configure:934: checking $ac_msg" >&5
+echo "configure:938: checking $ac_msg" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -964,7 +968,7 @@ fi
 
 # Group `mailman' must exist
 echo $ac_n "checking for mailman GID""... $ac_c" 1>&6
-echo "configure:968: checking for mailman GID" >&5
+echo "configure:972: checking for mailman GID" >&5
 
 # MAILMAN_GID == variable name
 # mailman == user id to check for
@@ -998,7 +1002,6 @@ rm -f conftest.out conftest.py
 if test -z "$MAILMAN_GID"
 then
     { echo "configure: error: 
-
 ***** No `mailman' group found!
 ***** Your system must have a `mailman' group defined (usually
 ***** in your /etc/group file).  Please see the INSTALL file
@@ -1015,8 +1018,9 @@ then
 else
     prefixcheck=$prefix
 fi
+
 echo $ac_n "checking permissions on $prefixcheck""... $ac_c" 1>&6
-echo "configure:1020: checking permissions on $prefixcheck" >&5
+echo "configure:1024: checking permissions on $prefixcheck" >&5
 
 cat > conftest.py <<EOF
 import os, grp, string
@@ -1052,17 +1056,17 @@ rm -f conftest.out conftest.py
 if test "$status" != "okay"
 then
     { echo "configure: error: 
-
 ***** Installation directory $prefixcheck is not configured properly!
 $status" 1>&2; exit 1; }
 fi
+
 echo "$ac_t""okay" 1>&6
 
 
 # Now find the UIDs and GIDs
 # Support --with-mail-gid and --with-cgi-gid
 echo $ac_n "checking for mail wrapper GID""... $ac_c" 1>&6
-echo "configure:1066: checking for mail wrapper GID" >&5
+echo "configure:1070: checking for mail wrapper GID" >&5
 # Check whether --with-mail-gid or --without-mail-gid was given.
 if test "${with_mail_gid+set}" = set; then
   withval="$with_mail_gid"
@@ -1113,7 +1117,6 @@ rm -f conftest.out conftest.py
 if test -z "$MAIL_GID"
 then
     { echo "configure: error: 
-
 ***** No existing group found for the mail_wrapper program.
 ***** This is the group that your mail delivery agent runs under, and
 ***** uses to run filter programs.  You might want to specify an
@@ -1122,8 +1125,9 @@ then
 ***** for details" 1>&2; exit 1; }
 fi
 
+
 echo $ac_n "checking for CGI wrapper GID""... $ac_c" 1>&6
-echo "configure:1127: checking for CGI wrapper GID" >&5
+echo "configure:1131: checking for CGI wrapper GID" >&5
 # Check whether --with-cgi-gid or --without-cgi-gid was given.
 if test "${with_cgi_gid+set}" = set; then
   withval="$with_cgi_gid"
@@ -1142,6 +1146,7 @@ else
     ac_cv_group_cgi=$with_cgi_gid
 fi
 
+
 # CGI_GID == variable name
 # $ac_cv_group_cgi == user id to check for
 
@@ -1174,7 +1179,6 @@ rm -f conftest.out conftest.py
 if test -z "$CGI_GID"
 then
     { echo "configure: error: 
-
 ***** No existing group found for the cgi_wrapper program.
 ***** This is the group that your Web server runs CGI scripts under.
 ***** You might want to specify an existing group with the
@@ -1182,9 +1186,33 @@ then
 ***** documentation, and the INSTALL file for details" 1>&2; exit 1; }
 fi
 
+
 #MM_FIND_USER_ID(ALIAS_UID, mailman, alias_wrapper)
 #MM_FIND_GROUP_ID(ALIAS_GID, mail, alias_wrapper)
 
+# Scan for --with-cgi-ext
+
+echo $ac_n "checking for --with-cgi-ext""... $ac_c" 1>&6
+echo "configure:1197: checking for --with-cgi-ext" >&5
+# Check whether --with-cgi-ext or --without-cgi-ext was given.
+if test "${with_cgi_ext+set}" = set; then
+  withval="$with_cgi_ext"
+  :
+fi
+
+if test -z "$with_cgi_ext"
+then
+    if eval "test \"`echo '$''{'ac_cv_ext_cgi'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+      ac_cv_ext_cgi=""
+fi
+
+else
+    ac_cv_ext_cgi=$with_cgi_ext
+fi
+CGIEXT=$ac_cv_ext_cgi
+echo "$ac_t""$CGIEXT" 1>&6
 
 # figure out the DEFAULT_HOST_NAME and DEFAULT_URL
 
@@ -1218,14 +1246,14 @@ EOF
 $PYTHON conftest.py
 
 echo $ac_n "checking for default fully qualified host name""... $ac_c" 1>&6
-echo "configure:1222: checking for default fully qualified host name" >&5
+echo "configure:1250: checking for default fully qualified host name" >&5
 if test -z "$FQDN"
 then
     FQDN=`head -1 conftest.out`
 fi
 echo "$ac_t""$FQDN" 1>&6
 echo $ac_n "checking for default URL host component""... $ac_c" 1>&6
-echo "configure:1229: checking for default URL host component" >&5
+echo "configure:1257: checking for default URL host component" >&5
 if test -z "$URL"
 then
     URL=`tail -1 conftest.out`
@@ -1237,12 +1265,12 @@ rm -f conftest.out conftest.py
 for ac_func in strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1241: checking for $ac_func" >&5
+echo "configure:1269: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1246 "configure"
+#line 1274 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1265,7 +1293,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1292,7 +1320,7 @@ done
 
 # Checks for header files.
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1296: checking how to run the C preprocessor" >&5
+echo "configure:1324: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1307,13 +1335,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1311 "configure"
+#line 1339 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1324,13 +1352,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1328 "configure"
+#line 1356 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1353,12 +1381,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1357: checking for ANSI C header files" >&5
+echo "configure:1385: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1362 "configure"
+#line 1390 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1366,7 +1394,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1383,7 +1411,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1387 "configure"
+#line 1415 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1401,7 +1429,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1405 "configure"
+#line 1433 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1422,7 +1450,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1426 "configure"
+#line 1454 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1433,7 +1461,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1460,17 +1488,17 @@ for ac_hdr in syslog.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1464: checking for $ac_hdr" >&5
+echo "configure:1492: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1469 "configure"
+#line 1497 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1499,12 +1527,12 @@ done
 
 # Checks for typedefs, structures, and compiler characteristics.
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:1503: checking for uid_t in sys/types.h" >&5
+echo "configure:1531: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1508 "configure"
+#line 1536 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -1533,7 +1561,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:1537: checking type of array argument to getgroups" >&5
+echo "configure:1565: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1541,7 +1569,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 1545 "configure"
+#line 1573 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -1566,7 +1594,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:1570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -1580,7 +1608,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 1584 "configure"
+#line 1612 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -1606,12 +1634,12 @@ EOF
 
 # Checks for library functions.
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1610: checking for vprintf" >&5
+echo "configure:1638: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1615 "configure"
+#line 1643 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -1634,7 +1662,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -1658,12 +1686,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1662: checking for _doprnt" >&5
+echo "configure:1690: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1667 "configure"
+#line 1695 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -1686,7 +1714,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -1870,6 +1898,7 @@ s%@OPT@%$OPT%g
 s%@MAILMAN_GID@%$MAILMAN_GID%g
 s%@MAIL_GID@%$MAIL_GID%g
 s%@CGI_GID@%$CGI_GID%g
+s%@CGIEXT@%$CGIEXT%g
 s%@FQDN@%$FQDN%g
 s%@URL@%$URL%g
 s%@CPP@%$CPP%g
diff --git a/configure.in b/configure.in
index 6f5d99629..b2d39ae95 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 897 $)
+AC_REVISION($Revision: 924 $)
 AC_PREREQ(2.0)
 AC_INIT(src/alias-wrapper.c)
 
@@ -256,6 +256,20 @@ fi
 #MM_FIND_USER_ID(ALIAS_UID, mailman, alias_wrapper)
 #MM_FIND_GROUP_ID(ALIAS_GID, mail, alias_wrapper)
 
+# Scan for --with-cgi-ext
+AC_SUBST(CGIEXT)
+AC_MSG_CHECKING(for --with-cgi-ext)
+AC_ARG_WITH(cgi-ext, [
+	--with-cgi-ext  	specify extensions on CGI programs])
+if test -z "$with_cgi_ext"
+then
+    AC_CACHE_VAL(ac_cv_ext_cgi, [dnl
+    ac_cv_ext_cgi=""])
+else
+    ac_cv_ext_cgi=$with_cgi_ext
+fi
+CGIEXT=$ac_cv_ext_cgi
+AC_MSG_RESULT($CGIEXT)
 
 # figure out the DEFAULT_HOST_NAME and DEFAULT_URL
 AC_SUBST(FQDN)
diff --git a/src/Makefile.in b/src/Makefile.in
index 0931c4ee9..551d115b8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -46,6 +46,7 @@ CGI_GID=	@CGI_GID@
 OPT=		@OPT@
 CFLAGS=		$(OPT) $(DEFS)
 CGIDIR= 	$(exec_prefix)/cgi-bin
+CGIEXT=		@CGIEXT@
 MAILDIR=	$(exec_prefix)/mail
 
 SHELL=		/bin/sh
@@ -99,8 +100,9 @@ common.o: $(srcdir)/common.c $(srcdir)/common.h
 install: all
 	for f in $(CGI_PROGS); \
 	do \
-	    $(INSTALL_PROGRAM) $$f $(CGIDIR); \
-	    chmod g+s $(CGIDIR)/$$f; \
+	    exe=$(CGIDIR)/$$f$(CGIEXT); \
+	    $(INSTALL_PROGRAM) $$f $$exe; \
+	    chmod g+s $$exe; \
 	done
 	for f in $(MAIL_PROGS); \
 	do \