patch from elrond: configure cleanups

3 files changed, 56 insertions, 99 deletions

diff --git a/source/configure b/source/configure
index de40a9d1475..fa11ee5ec68 100755
--- a/source/configure
+++ b/source/configure
@@ -1224,7 +1224,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} int $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:1231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -2249,7 +2249,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
+typedef int charset[2]; const charset x = {0,0};
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -2324,7 +2324,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw foo() {
+} int $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:2331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -3348,7 +3348,7 @@ else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  samba_cv_have_errno_decl=no
+  samba_cv_have_errno=no
 fi
 rm -f conftest*
 fi
@@ -8894,10 +8894,6 @@ if test "${with_libmsrpc+set}" = set; then
    case "$withval" in
   no)
     echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define WITH_LIBMSRPC 1
-EOF
-
 	LIBMSRPC="bin/libmsrpc.so"
 
 	if test x$ATTEMPT_LIBMSRPC32_BUILD = x; then
@@ -8927,17 +8923,13 @@ fi
 #################################################
 # check for libubiqx support
 echo $ac_n "checking whether to use libubiqx""... $ac_c" 1>&6
-echo "configure:8931: checking whether to use libubiqx" >&5
+echo "configure:8927: checking whether to use libubiqx" >&5
 # Check whether --with-libubiqx or --without-libubiqx was given.
 if test "${with_libubiqx+set}" = set; then
   withval="$with_libubiqx"
    case "$withval" in
   yes)
     echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define WITH_LIBUBIQX 1
-EOF
-
 	LIBUBIQX="bin/libubiqx.so"
 
 	if test x$ATTEMPT_LIBUBIQX32_BUILD = x; then
@@ -8967,17 +8959,13 @@ fi
 #################################################
 # check for libsamba support
 echo $ac_n "checking whether to use libsamba""... $ac_c" 1>&6
-echo "configure:8971: checking whether to use libsamba" >&5
+echo "configure:8963: checking whether to use libsamba" >&5
 # Check whether --with-libsamba or --without-libsamba was given.
 if test "${with_libsamba+set}" = set; then
   withval="$with_libsamba"
    case "$withval" in
   yes)
     echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define WITH_LIBSAMBA 1
-EOF
-
 	LIBSAMBA="bin/libsamba.so"
 
 	if test x$ATTEMPT_LIBSAMBA32_BUILD = x; then
@@ -9007,17 +8995,13 @@ fi
 #################################################
 # check for libnmb support
 echo $ac_n "checking whether to use libnmb""... $ac_c" 1>&6
-echo "configure:9011: checking whether to use libnmb" >&5
+echo "configure:8999: checking whether to use libnmb" >&5
 # Check whether --with-libnmb or --without-libnmb was given.
 if test "${with_libnmb+set}" = set; then
   withval="$with_libnmb"
    case "$withval" in
   yes)
     echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define WITH_LIBNMB 1
-EOF
-
 	LIBNMB="bin/libnmb.so"
 
 	if test x$ATTEMPT_LIBNMB32_BUILD = x; then
@@ -9047,17 +9031,13 @@ fi
 #################################################
 # check for libsurs support
 echo $ac_n "checking whether to use libsurs""... $ac_c" 1>&6
-echo "configure:9051: checking whether to use libsurs" >&5
+echo "configure:9035: checking whether to use libsurs" >&5
 # Check whether --with-libsurs or --without-libsurs was given.
 if test "${with_libsurs+set}" = set; then
   withval="$with_libsurs"
    case "$withval" in
   yes)
     echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define WITH_LIBSURS 1
-EOF
-
 	LIBSURS="bin/libsurs.so"
 
 	if test x$ATTEMPT_LIBSURS32_BUILD = x; then
@@ -9087,17 +9067,13 @@ fi
 #################################################
 # check for libsmbpw support
 echo $ac_n "checking whether to use libsmbpw""... $ac_c" 1>&6
-echo "configure:9091: checking whether to use libsmbpw" >&5
+echo "configure:9071: checking whether to use libsmbpw" >&5
 # Check whether --with-libsmbpw or --without-libsmbpw was given.
 if test "${with_libsmbpw+set}" = set; then
   withval="$with_libsmbpw"
    case "$withval" in
   yes)
     echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define WITH_LIBSMBPW 1
-EOF
-
 	LIBSMBPW="bin/libsmbpw.so"
 
 	if test x$ATTEMPT_LIBSMBPW32_BUILD = x; then
@@ -9128,17 +9104,13 @@ fi
 #################################################
 # check for libsmb support
 echo $ac_n "checking whether to use libsmb""... $ac_c" 1>&6
-echo "configure:9132: checking whether to use libsmb" >&5
+echo "configure:9108: checking whether to use libsmb" >&5
 # Check whether --with-libsmb or --without-libsmb was given.
 if test "${with_libsmb+set}" = set; then
   withval="$with_libsmb"
    case "$withval" in
   yes)
     echo "$ac_t""yes" 1>&6
-    cat >> confdefs.h <<\EOF
-#define WITH_LIBSMB 1
-EOF
-
 	LIBSMB="bin/libsmb.so"
 
 	if test x$ATTEMPT_LIBSMB32_BUILD = x; then
@@ -9169,7 +9141,7 @@ fi
 #################################################
 # check for smbwrapper support
 echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6
-echo "configure:9173: checking whether to use smbwrapper" >&5
+echo "configure:9145: checking whether to use smbwrapper" >&5
 # Check whether --with-smbwrapper or --without-smbwrapper was given.
 if test "${with_smbwrapper+set}" = set; then
   withval="$with_smbwrapper"
@@ -9213,7 +9185,7 @@ fi
 #################################################
 # check for the AFS filesystem
 echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6
-echo "configure:9217: checking whether to use AFS" >&5
+echo "configure:9189: checking whether to use AFS" >&5
 # Check whether --with-afs or --without-afs was given.
 if test "${with_afs+set}" = set; then
   withval="$with_afs"
@@ -9239,7 +9211,7 @@ fi
 #################################################
 # check for the DFS auth system
 echo $ac_n "checking whether to use DFS auth""... $ac_c" 1>&6
-echo "configure:9243: checking whether to use DFS auth" >&5
+echo "configure:9215: checking whether to use DFS auth" >&5
 # Check whether --with-dfs or --without-dfs was given.
 if test "${with_dfs+set}" = set; then
   withval="$with_dfs"
@@ -9264,7 +9236,7 @@ fi
 #################################################
 # check for Kerberos IV auth system
 echo $ac_n "checking whether to use Kerberos IV""... $ac_c" 1>&6
-echo "configure:9268: checking whether to use Kerberos IV" >&5
+echo "configure:9240: checking whether to use Kerberos IV" >&5
 # Check whether --with-krb4 or --without-krb4 was given.
 if test "${with_krb4+set}" = set; then
   withval="$with_krb4"
@@ -9274,7 +9246,7 @@ if test "${with_krb4+set}" = set; then
 EOF
 
     echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
-echo "configure:9278: checking for dn_expand in -lresolv" >&5
+echo "configure:9250: checking for dn_expand in -lresolv" >&5
 ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9282,7 +9254,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9286 "configure"
+#line 9258 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9293,7 +9265,7 @@ int main() {
 dn_expand()
 ; return 0; }
 EOF
-if { (eval echo configure:9297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9332,7 +9304,7 @@ fi
 #################################################
 # check for automount support
 echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6
-echo "configure:9336: checking whether to use AUTOMOUNT" >&5
+echo "configure:9308: checking whether to use AUTOMOUNT" >&5
 # Check whether --with-automount or --without-automount was given.
 if test "${with_automount+set}" = set; then
   withval="$with_automount"
@@ -9357,7 +9329,7 @@ fi
 #################################################
 # check for smbmount support
 echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6
-echo "configure:9361: checking whether to use SMBMOUNT" >&5
+echo "configure:9333: checking whether to use SMBMOUNT" >&5
 # Check whether --with-smbmount or --without-smbmount was given.
 if test "${with_smbmount+set}" = set; then
   withval="$with_smbmount"
@@ -9385,7 +9357,7 @@ fi
 #################################################
 # check to use a tdb surs database
 echo $ac_n "checking whether to use SURS tdb database""... $ac_c" 1>&6
-echo "configure:9389: checking whether to use SURS tdb database" >&5
+echo "configure:9361: checking whether to use SURS tdb database" >&5
 # Check whether --with-surstdb or --without-surstdb was given.
 if test "${with_surstdb+set}" = set; then
   withval="$with_surstdb"
@@ -9410,7 +9382,7 @@ fi
 #################################################
 # check for a LDAP password database
 echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6
-echo "configure:9414: checking whether to use LDAP password database" >&5
+echo "configure:9386: checking whether to use LDAP password database" >&5
 # Check whether --with-ldap or --without-ldap was given.
 if test "${with_ldap+set}" = set; then
   withval="$with_ldap"
@@ -9436,7 +9408,7 @@ fi
 #################################################
 # check for a LDAP password database
 echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6
-echo "configure:9440: checking whether to use LDAP password database" >&5
+echo "configure:9412: checking whether to use LDAP password database" >&5
 # Check whether --with-nt5ldap or --without-nt5ldap was given.
 if test "${with_nt5ldap+set}" = set; then
   withval="$with_nt5ldap"
@@ -9462,7 +9434,7 @@ fi
 #################################################
 # check for a LDAP password database
 echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6
-echo "configure:9466: checking whether to use LDAP password database" >&5
+echo "configure:9438: checking whether to use LDAP password database" >&5
 # Check whether --with-nt5ldap or --without-nt5ldap was given.
 if test "${with_nt5ldap+set}" = set; then
   withval="$with_nt5ldap"
@@ -9488,7 +9460,7 @@ fi
 #################################################
 # check for a NISPLUS password database
 echo $ac_n "checking whether to use NISPLUS password database""... $ac_c" 1>&6
-echo "configure:9492: checking whether to use NISPLUS password database" >&5
+echo "configure:9464: checking whether to use NISPLUS password database" >&5
 # Check whether --with-nisplus or --without-nisplus was given.
 if test "${with_nisplus+set}" = set; then
   withval="$with_nisplus"
@@ -9513,7 +9485,7 @@ fi
 #################################################
 # check for a NISPLUS_HOME support 
 echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6
-echo "configure:9517: checking whether to use NISPLUS_HOME" >&5
+echo "configure:9489: checking whether to use NISPLUS_HOME" >&5
 # Check whether --with-nisplus-home or --without-nisplus-home was given.
 if test "${with_nisplus_home+set}" = set; then
   withval="$with_nisplus_home"
@@ -9538,7 +9510,7 @@ fi
 #################################################
 # check for the secure socket layer
 echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6
-echo "configure:9542: checking whether to use SSL" >&5
+echo "configure:9514: checking whether to use SSL" >&5
 # Check whether --with-ssl or --without-ssl was given.
 if test "${with_ssl+set}" = set; then
   withval="$with_ssl"
@@ -9563,7 +9535,7 @@ fi
 #################################################
 # check for experimental mmap support
 echo $ac_n "checking whether to use MMAP""... $ac_c" 1>&6
-echo "configure:9567: checking whether to use MMAP" >&5
+echo "configure:9539: checking whether to use MMAP" >&5
 # Check whether --with-mmap or --without-mmap was given.
 if test "${with_mmap+set}" = set; then
   withval="$with_mmap"
@@ -9588,7 +9560,7 @@ fi
 #################################################
 # check for syslog logging
 echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6
-echo "configure:9592: checking whether to use syslog logging" >&5
+echo "configure:9564: checking whether to use syslog logging" >&5
 # Check whether --with-syslog or --without-syslog was given.
 if test "${with_syslog+set}" = set; then
   withval="$with_syslog"
@@ -9613,7 +9585,7 @@ fi
 #################################################
 # check for a shared memory profiling support
 echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6
-echo "configure:9617: checking whether to use profiling" >&5
+echo "configure:9589: checking whether to use profiling" >&5
 # Check whether --with-profile or --without-profile was given.
 if test "${with_profile+set}" = set; then
   withval="$with_profile"
@@ -9639,7 +9611,7 @@ fi
 #################################################
 # check for experimental netatalk resource fork support
 echo $ac_n "checking whether to support netatalk""... $ac_c" 1>&6
-echo "configure:9643: checking whether to support netatalk" >&5
+echo "configure:9615: checking whether to support netatalk" >&5
 # Check whether --with-netatalk or --without-netatalk was given.
 if test "${with_netatalk+set}" = set; then
   withval="$with_netatalk"
@@ -9666,7 +9638,7 @@ fi
 QUOTAOBJS=noquotas.o
 
 echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6
-echo "configure:9670: checking whether to support disk-quotas" >&5
+echo "configure:9642: checking whether to support disk-quotas" >&5
 # Check whether --with-quotas or --without-quotas was given.
 if test "${with_quotas+set}" = set; then
   withval="$with_quotas"
@@ -9689,14 +9661,14 @@ fi
 #################################################
 # these tests are taken from the GNU fileutils package
 echo "checking how to get filesystem space usage" 1>&6
-echo "configure:9693: checking how to get filesystem space usage" >&5
+echo "configure:9665: checking how to get filesystem space usage" >&5
 space=no
 
 # Test for statvfs64.
 if test $space = no; then
   # SVR4
   echo $ac_n "checking statvfs64 function (SVR4)""... $ac_c" 1>&6
-echo "configure:9700: checking statvfs64 function (SVR4)" >&5
+echo "configure:9672: checking statvfs64 function (SVR4)" >&5
 if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9704,7 +9676,7 @@ else
   fu_cv_sys_stat_statvfs64=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 9708 "configure"
+#line 9680 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -9715,7 +9687,7 @@ else
     exit (statfs64 (".", &fsd));
   }
 EOF
-if { (eval echo configure:9719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statvfs64=yes
 else
@@ -9748,12 +9720,12 @@ fi
 if test $space = no; then
   # SVR4
   echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6
-echo "configure:9752: checking statvfs function (SVR4)" >&5
+echo "configure:9724: checking statvfs function (SVR4)" >&5
 if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9757 "configure"
+#line 9729 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statvfs.h>
@@ -9761,7 +9733,7 @@ int main() {
 struct statvfs fsd; statvfs (0, &fsd);
 ; return 0; }
 EOF
-if { (eval echo configure:9765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   fu_cv_sys_stat_statvfs=yes
 else
@@ -9786,7 +9758,7 @@ fi
 if test $space = no; then
   # DEC Alpha running OSF/1
   echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
-echo "configure:9790: checking for 3-argument statfs function (DEC OSF/1)" >&5
+echo "configure:9762: checking for 3-argument statfs function (DEC OSF/1)" >&5
   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9794,7 +9766,7 @@ else
   fu_cv_sys_stat_statfs3_osf1=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 9798 "configure"
+#line 9770 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -9807,7 +9779,7 @@ else
     exit (statfs (".", &fsd, sizeof (struct statfs)));
   }
 EOF
-if { (eval echo configure:9811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs3_osf1=yes
 else
@@ -9834,7 +9806,7 @@ fi
 if test $space = no; then
 # AIX
   echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
-echo "configure:9838: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+echo "configure:9810: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9842,7 +9814,7 @@ else
   fu_cv_sys_stat_statfs2_bsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 9846 "configure"
+#line 9818 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_PARAM_H
@@ -9861,7 +9833,7 @@ else
   exit (statfs (".", &fsd));
   }
 EOF
-if { (eval echo configure:9865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_bsize=yes
 else
@@ -9888,7 +9860,7 @@ fi
 if test $space = no; then
 # SVR3
   echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
-echo "configure:9892: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+echo "configure:9864: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9896,7 +9868,7 @@ else
   fu_cv_sys_stat_statfs4=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 9900 "configure"
+#line 9872 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statfs.h>
@@ -9906,7 +9878,7 @@ else
   exit (statfs (".", &fsd, sizeof fsd, 0));
   }
 EOF
-if { (eval echo configure:9910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs4=yes
 else
@@ -9933,7 +9905,7 @@ fi
 if test $space = no; then
 # 4.4BSD and NetBSD
   echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6
-echo "configure:9937: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
+echo "configure:9909: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9941,7 +9913,7 @@ else
   fu_cv_sys_stat_statfs2_fsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 9945 "configure"
+#line 9917 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -9957,7 +9929,7 @@ else
   exit (statfs (".", &fsd));
   }
 EOF
-if { (eval echo configure:9961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_fsize=yes
 else
@@ -9984,7 +9956,7 @@ fi
 if test $space = no; then
   # Ultrix
   echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
-echo "configure:9988: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+echo "configure:9960: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
   if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9992,7 +9964,7 @@ else
   fu_cv_sys_stat_fs_data=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 9996 "configure"
+#line 9968 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -10012,7 +9984,7 @@ else
   exit (statfs (".", &fsd) != 1);
   }
 EOF
-if { (eval echo configure:10016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_fs_data=yes
 else
@@ -10041,11 +10013,11 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 10045 "configure"
+#line 10017 "configure"
 #include "confdefs.h"
 #include "${srcdir-.}/tests/summary.c"
 EOF
-if { (eval echo configure:10049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "configure OK";
 else
diff --git a/source/configure.in b/source/configure.in
index 68e84f6bbe1..7120421b4a0 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -106,7 +106,7 @@ AC_CHECK_TYPE(ssize_t, int)
 
 AC_CACHE_CHECK([for errno in errno.h],samba_cv_errno, [
     AC_TRY_COMPILE([#include <errno.h>],[int i = errno],
-	samba_cv_errno=yes,samba_cv_have_errno_decl=no)])
+	samba_cv_errno=yes,samba_cv_have_errno=no)])
 if test x"$samba_cv_errno" = x"yes"; then
    AC_DEFINE(HAVE_ERRNO_DECL)
 fi
@@ -771,7 +771,6 @@ AC_ARG_WITH(libmsrpc,
 [ case "$withval" in
   no)
     AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_LIBMSRPC)
 	LIBMSRPC="bin/libmsrpc.so"
 
 	if test x$ATTEMPT_LIBMSRPC32_BUILD = x; then
@@ -804,7 +803,6 @@ AC_ARG_WITH(libubiqx,
 [ case "$withval" in
   yes)
     AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_LIBUBIQX)
 	LIBUBIQX="bin/libubiqx.so"
 
 	if test x$ATTEMPT_LIBUBIQX32_BUILD = x; then
@@ -837,7 +835,6 @@ AC_ARG_WITH(libsamba,
 [ case "$withval" in
   yes)
     AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_LIBSAMBA)
 	LIBSAMBA="bin/libsamba.so"
 
 	if test x$ATTEMPT_LIBSAMBA32_BUILD = x; then
@@ -870,7 +867,6 @@ AC_ARG_WITH(libnmb,
 [ case "$withval" in
   yes)
     AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_LIBNMB)
 	LIBNMB="bin/libnmb.so"
 
 	if test x$ATTEMPT_LIBNMB32_BUILD = x; then
@@ -903,7 +899,6 @@ AC_ARG_WITH(libsurs,
 [ case "$withval" in
   yes)
     AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_LIBSURS)
 	LIBSURS="bin/libsurs.so"
 
 	if test x$ATTEMPT_LIBSURS32_BUILD = x; then
@@ -936,7 +931,6 @@ AC_ARG_WITH(libsmbpw,
 [ case "$withval" in
   yes)
     AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_LIBSMBPW)
 	LIBSMBPW="bin/libsmbpw.so"
 
 	if test x$ATTEMPT_LIBSMBPW32_BUILD = x; then
@@ -970,7 +964,6 @@ AC_ARG_WITH(libsmb,
 [ case "$withval" in
   yes)
     AC_MSG_RESULT(yes)
-    AC_DEFINE(WITH_LIBSMB)
 	LIBSMB="bin/libsmb.so"
 
 	if test x$ATTEMPT_LIBSMB32_BUILD = x; then
diff --git a/source/include/config.h.in b/source/include/config.h.in
index 6c417f6f193..17aaa709083 100644
--- a/source/include/config.h.in
+++ b/source/include/config.h.in
@@ -150,14 +150,6 @@
 #undef HAVE_BIGCRYPT
 #undef HAVE_GETPRPWNAM
 
-#undef WITH_LIBMSRPC
-#undef WITH_LIBNMB
-#undef WITH_LIBSAMBA
-#undef WITH_LIBSMB
-#undef WITH_LIBSURS
-#undef WITH_LIBSMBPW
-#undef WITH_LIBUBIQX
-
 #undef USE_SETEUID
 #undef USE_SETRESUID
 #undef USE_SETREUID