Bootstrapped

diff --git a/configure b/configure
index f492ffa39b2babb69f7690c1cf400ea629ed25a5..cd115447a852c3e18c228465f8a59cdc721ba475 100755 (executable)
--- a/configure
+++ b/configure
@@ -22850,11 +22850,12 @@ default|"")
        case "$host" in
            *-solaris*)
                if test "$GCC" = "yes"; then
-                   echo "Removing -Xa for gcc on $host"
+                   echo "Removing -Xa for gcc/g++ on $host"
                    CFLAGS="`echo $CFLAGS | sed -e 's/-Xa//'`"
                    CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-Xa//'`"
-                   echo "Replacing -xarch=generic64 with -m64 for gcc on $host"
+                   echo "Replacing -xarch=generic64 with -m64 for gcc/g++ on $host"
                    CFLAGS="`echo $CFLAGS | sed -e 's/-xarch=generic64/-m64/'`"
+                   CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-xarch=generic64/-m64/'`"
                    LDFLAGS="`echo $LDFLAGS | sed -e 's/-xarch=generic64//'`"
                fi
                echo "Removing -Usun on $host"
@@ -23089,6 +23090,27 @@ done
 
 
 
+test -n "$AUTH_MODULE_basic" &&
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_AUTH_MODULE_BASIC 1
+_ACEOF
+
+test -n "$AUTH_MODULE_digest" &&
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_AUTH_MODULE_DIGEST 1
+_ACEOF
+
+test -n "$AUTH_MODULE_ntlm" &&
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_AUTH_MODULE_NTLM 1
+_ACEOF
+
+test -n "$AUTH_MODULE_negotiate" &&
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_AUTH_MODULE_NEGOTIATE 1
+_ACEOF
+
+
 if test -n "$AUTH_MODULE_basic"; then
        BASIC_AUTH_HELPERS="all"
 fi

diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index 91194ace79c78752444f5f81554b296166134289..97e919c3622e525f647f65e500451d43186d2865 100644 (file)
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -61,6 +61,18 @@
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 
+/* Basic auth module is built */
+#undef HAVE_AUTH_MODULE_BASIC
+
+/* Digest auth module is built */
+#undef HAVE_AUTH_MODULE_DIGEST
+
+/* Negotiate auth module is built */
+#undef HAVE_AUTH_MODULE_NEGOTIATE
+
+/* NTLM auth module is built */
+#undef HAVE_AUTH_MODULE_NTLM
+
 /* Define to 1 if you have the `backtrace_symbols_fd' function. */
 #undef HAVE_BACKTRACE_SYMBOLS_FD