r6118: Make it so that we can do --with-zlib=no in configure and also a couple

of small typos.
(This used to be commit 9b4069e84573f85ce4341ceacd35737a18726a0b)

3 files changed, 38 insertions, 23 deletions

diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 41273a08da..818c33a11d 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -116,7 +116,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 	}
 
 	if (!ldb_url) {
-		fprintf(stderr, "You must specify a ldb URL\n\n");
+		fprintf(stderr, "You must specify an ldb URL\n\n");
 		usage();
 	}
 
diff --git a/source4/librpc/config.m4 b/source4/librpc/config.m4
index d67e880a38..290b0d16f2 100644
--- a/source4/librpc/config.m4
+++ b/source4/librpc/config.m4
@@ -7,29 +7,44 @@ ZLIB_CFLAGS=""
 ZLIB_CPPFLAGS=""
 ZLIB_LDFLAGS=""
 
-AC_CHECK_HEADERS(zlib.h)  
-if test x"$ac_cv_header_zlib_h" != x"yes"; then
-	with_zlib_support=no
-fi
+AC_MSG_CHECKING([for ZLIB support])
+
+AC_ARG_WITH(zlib,
+[  --with-zlib             ZLIB support (default yes)],
+[ case "$withval" in
+    yes|no)
+	with_zlib_support=$withval
+	;;
+  esac ])
+
+AC_MSG_RESULT($with_zlib_support)
 
 if test x"$with_zlib_support" != x"no"; then
-  AC_CHECK_LIB_EXT(z, ZLIB_LIBS, inflate)
-
-  if test x"$ac_cv_lib_ext_z_inflate" = x"yes"; then
-    AC_DEFINE(HAVE_ZLIB,1,[Whether zlib is available])
-    with_zlib_support=yes
-    SMB_EXT_LIB_ENABLE(ZLIB,YES)
-  else
-    ZLIB_LIBS=""
-    with_zlib_support=no
+
+  AC_MSG_CHECKING(whether ZLIB support is available)AC_CHECK_HEADERS(zlib.h)  
+  if test x"$ac_cv_header_zlib_h" != x"yes"; then
+	  with_zlib_support=no
   fi
-  LIBS=$ac_save_LIBS
-fi
-AC_MSG_CHECKING(whether ZLIB support is available)
-AC_MSG_RESULT($with_zlib_support)
 
-# for now enable this always but maybe all fields are empty
-# TODO: move compression methods to seperate files each
-SMB_EXT_LIB_ENABLE(ZLIB,YES)
+  if test x"$with_zlib_support" != x"no"; then
+    AC_CHECK_LIB_EXT(z, ZLIB_LIBS, inflate)
+
+    if test x"$ac_cv_lib_ext_z_inflate" = x"yes"; then
+      AC_DEFINE(HAVE_ZLIB,1,[Whether zlib is available])
+      with_zlib_support=yes
+      SMB_EXT_LIB_ENABLE(ZLIB,YES)
+    else
+      ZLIB_LIBS=""
+      with_zlib_support=no
+    fi
+    LIBS=$ac_save_LIBS
+  fi
+
+  AC_MSG_RESULT($with_zlib_support)
+
+  # for now enable this always but maybe all fields are empty
+  # TODO: move compression methods to seperate files each
+  SMB_EXT_LIB_ENABLE(ZLIB,YES)
 
-SMB_EXT_LIB(ZLIB,[${ZLIB_LIBS}],[${ZLIB_CFLAGS}],[${ZLIB_CPPFLAGS}],[${ZLIB_LDFLAGS}])
+  SMB_EXT_LIB(ZLIB,[${ZLIB_LIBS}],[${ZLIB_CFLAGS}],[${ZLIB_CPPFLAGS}],[${ZLIB_LDFLAGS}])
+fi
\ No newline at end of file
diff --git a/source4/script/provision.pl b/source4/script/provision.pl
index c3c7fc13c2..e1d5278453 100755
--- a/source4/script/provision.pl
+++ b/source4/script/provision.pl
@@ -358,7 +358,7 @@ if (!$opt_users) {
 
 $opt_nobody || die "Unable to determine a user for 'nobody'\n";
 $opt_nogroup || die "Unable to determine a group for 'nogroup'\n";
-$opt_users || die "Unable to determine a group for 'user'\n";
+$opt_users || die "Unable to determine a group for 'users'\n";
 $opt_wheel || die "Unable to determine a group for 'wheel'\n";
 
 print "Using nobody='$opt_nobody'  nogroup='$opt_nogroup'  wheel='$opt_wheel'  users='$opt_users'\n";