From 4a090ba06a54f5da179ac02bb307cc03d08831bf Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 16 Jul 2003 05:34:56 +0000
Subject: trying to get HEAD building again.  If you want the code prior to
 this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE (This used to be commit
 adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

---
 source3/script/.cvsignore     |  1 -
 source3/script/build_env.sh   | 26 ++++++++++++++++----------
 source3/script/installswat.sh |  2 +-
 source3/script/mkproto.awk    |  6 +++++-
 4 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'source3/script')

diff --git a/source3/script/.cvsignore b/source3/script/.cvsignore
index 5efd0d33db..7a8114ecd7 100644
--- a/source3/script/.cvsignore
+++ b/source3/script/.cvsignore
@@ -1,2 +1 @@
 findsmb
-mkproto.sh
diff --git a/source3/script/build_env.sh b/source3/script/build_env.sh
index 0000759f16..eb54f37aed 100755
--- a/source3/script/build_env.sh
+++ b/source3/script/build_env.sh
@@ -1,25 +1,31 @@
 #!/bin/sh
 
+if [ $# -lt 3 ]
+then
+    echo "Usage: $0 srcdir builddir compiler"
+    exit 1
+fi
+
 uname=`uname -a`
 date=`date`
 srcdir=$1
 builddir=$2
 compiler=$3
 
-	if [ ! "x$USER" = "x" ]; then
-	    whoami=$USER
-	else 
-	    if [ ! "x$LOGNAME" = "x" ]; then
-		whoami=$LOGNAME
-	    else
-		whoami=`whoami || id -un`
-	    fi
-	fi
+if [ ! "x$USER" = "x" ]; then
+    whoami=$USER
+else 
+    if [ ! "x$LOGNAME" = "x" ]; then
+	whoami=$LOGNAME
+    else
+	whoami=`whoami || id -un`
+    fi
+fi
 
 host=`hostname`
 
 cat <<EOF
-/* This file is automatically generated with "make build_env". DO NOT EDIT */
+/* This file is automatically generated with "make include/build_env.h". DO NOT EDIT */
 
 #ifndef _BUILD_ENV_H
 #define _BUILD_ENV_H
diff --git a/source3/script/installswat.sh b/source3/script/installswat.sh
index c66604cdb8..d1f8ea191d 100755
--- a/source3/script/installswat.sh
+++ b/source3/script/installswat.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#fist version March 1998, Andrew Tridgell
+#first version March 1998, Andrew Tridgell
 
 SWATDIR=$1
 SRCDIR=$2/
diff --git a/source3/script/mkproto.awk b/source3/script/mkproto.awk
index 919ae2aa7e..6a45a70cc3 100644
--- a/source3/script/mkproto.awk
+++ b/source3/script/mkproto.awk
@@ -142,7 +142,11 @@ END {
     gotstart = 1;
   }
 
-  if( $0 ~ /^SAM_ACCT_INFO_NODE|^SMB_ACL_T|^ADS_MODLIST|^PyObject|^SORTED_TREE|^REGISTRY_HOOK|^REGISTRY_VALUE|^DEVICEMODE|^PAC_DATA/ ) {
+  if( $0 ~ /^SAM_ACCT_INFO_NODE|^SMB_ACL_T|^ADS_MODLIST|^PyObject|^SORTED_TREE|^REGISTRY_HOOK|^REGISTRY_VALUE|^DEVICEMODE|^PAC_DATA|^NET_USER_INFO_3|^smb_event_id_t/ ) {
+    gotstart = 1;
+  }
+
+  if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2/ ) {
     gotstart = 1;
   }
 
-- 
cgit