merge the version.h autogeneration stuff from 3.0

metze
(This used to be commit 24dc237e109f6dce69814b22e0fb7878a7f6bfa8)

4 files changed, 45 insertions, 3 deletions

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 3c9a5eb231..1b8e3bd93e 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -66,7 +66,7 @@ static void popt_common_callback(poptContext con,
 		break;
 
 	case 'V':
-		printf( "Version %s\n", SAMBA_VERSION );
+		printf( "Version %s\n", SAMBA_VERSION_STRING );
 		exit(0);
 		break;
 
diff --git a/source4/lib/fault.c b/source4/lib/fault.c
index 5a76ce2c0c..47a43bca84 100644
--- a/source4/lib/fault.c
+++ b/source4/lib/fault.c
@@ -39,7 +39,7 @@ static void fault_report(int sig)
 	if (counter) _exit(1);
 
 	DEBUG(0,("===============================================================\n"));
-	DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)getpid(),SAMBA_VERSION));
+	DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)getpid(),SAMBA_VERSION_STRING));
 	DEBUG(0,("\nPlease read the file BUGS.txt in the distribution\n"));
 	DEBUG(0,("===============================================================\n"));
 
diff --git a/source4/lib/popt_common.c b/source4/lib/popt_common.c
index 3c9a5eb231..1b8e3bd93e 100644
--- a/source4/lib/popt_common.c
+++ b/source4/lib/popt_common.c
@@ -66,7 +66,7 @@ static void popt_common_callback(poptContext con,
 		break;
 
 	case 'V':
-		printf( "Version %s\n", SAMBA_VERSION );
+		printf( "Version %s\n", SAMBA_VERSION_STRING );
 		exit(0);
 		break;
 
diff --git a/source4/lib/version.c b/source4/lib/version.c
new file mode 100644
index 0000000000..99f836c2d5
--- /dev/null
+++ b/source4/lib/version.c
@@ -0,0 +1,42 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Samba Version functions
+   
+   Copyright (C) Stefan Metzmacher	2003
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+const char *samba_version_string(void)
+{
+#ifndef SAMBA_VERSION_VENDOR_SUFFIX
+	return SAMBA_VERSION_OFFICIAL_STRING;
+#else
+	static fstring samba_version;
+	static BOOL init_samba_version;
+
+	if (init_samba_version)
+		return samba_version;
+
+	snprintf(samba_version,sizeof(samba_version),"%s-%s",
+		SAMBA_VERSION_OFFICIAL_STRING,
+		SAMBA_VERSION_VENDOR_SUFFIX);
+
+	init_samba_version = True;
+	return samba_version;
+#endif
+}