svn commit: samba r6118 - in branches/SAMBA_4_0/source: lib/ldb/tools librpc script

[sharpe at samba.org]

Author: sharpe
Date: 2005-03-30 00:15:16 +0000 (Wed, 30 Mar 2005)
New Revision: 6118

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6118

Log:

Make it so that we can do --with-zlib=no in configure and also a couple 
of small typos.


Modified:
   branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c
   branches/SAMBA_4_0/source/librpc/config.m4
   branches/SAMBA_4_0/source/script/provision.pl


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c	2005-03-29 15:17:26 UTC (rev 6117)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbadd.c	2005-03-30 00:15:16 UTC (rev 6118)
@@ -116,7 +116,7 @@
 	}
 
 	if (!ldb_url) {
-		fprintf(stderr, "You must specify a ldb URL\n\n");
+		fprintf(stderr, "You must specify an ldb URL\n\n");
 		usage();
 	}
 

Modified: branches/SAMBA_4_0/source/librpc/config.m4
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.m4	2005-03-29 15:17:26 UTC (rev 6117)
+++ branches/SAMBA_4_0/source/librpc/config.m4	2005-03-30 00:15:16 UTC (rev 6118)
@@ -7,29 +7,44 @@
 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)
 
-SMB_EXT_LIB(ZLIB,[${ZLIB_LIBS}],[${ZLIB_CFLAGS}],[${ZLIB_CPPFLAGS}],[${ZLIB_LDFLAGS}])
+    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}])
+fi
\ No newline at end of file

Modified: branches/SAMBA_4_0/source/script/provision.pl
===================================================================
--- branches/SAMBA_4_0/source/script/provision.pl	2005-03-29 15:17:26 UTC (rev 6117)
+++ branches/SAMBA_4_0/source/script/provision.pl	2005-03-30 00:15:16 UTC (rev 6118)
@@ -358,7 +358,7 @@
 
 $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";