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

of small typos.

diff --git a/source/lib/ldb/tools/ldbadd.c b/source/lib/ldb/tools/ldbadd.c
index 41273a08da2708252e40dcf5c6e039e76b9340ce..818c33a11dcde12aeec0619dca21bbde9618876a 100644 (file)
--- a/source/lib/ldb/tools/ldbadd.c
+++ b/source/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/source/librpc/config.m4 b/source/librpc/config.m4
index d67e880a386fea07dd3980e494cf66c688c52cc0..290b0d16f2f62b35cf02683abb0bbedf99f05483 100644 (file)
--- a/source/librpc/config.m4
+++ b/source/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/source/script/provision.pl b/source/script/provision.pl
index c3c7fc13c2737706260e65baa6c00543b4eec1c7..e1d5278453a293e90773705919eeb93439ffbb2e 100755 (executable)
--- a/source/script/provision.pl
+++ b/source/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";