summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-10-25 06:49:46 +0000
committerStefan Metzmacher <metze@samba.org>2010-10-25 08:16:28 +0000
commit8ea6f41ec9d3e2577432a8d9be100f1f42775787 (patch)
tree1ecdb2b2eb12a365a3d07e4c07ebf551b3bd573a
parente54d58d11388d0ff4afe3d08e0b19b0dd43835ad (diff)
downloadsamba-8ea6f41ec9d3e2577432a8d9be100f1f42775787.tar.gz
samba-8ea6f41ec9d3e2577432a8d9be100f1f42775787.tar.bz2
samba-8ea6f41ec9d3e2577432a8d9be100f1f42775787.zip
s4-waf: don't generate PACKAGE_* defines in config.h
- We don't use them anywhere (heimdal has special rules) - They calculate the version at configure time and may contain the wrong git hash while building - If we really need them in future we should add them to version.h and not config.h, as the changing git hash will trigger a full rebuild if config.h changes. metze
-rw-r--r--source4/heimdal_build/config.h8
-rw-r--r--source4/heimdal_build/roken.h4
-rw-r--r--source4/heimdal_build/wscript_build1
-rw-r--r--source4/wscript7
4 files changed, 8 insertions, 12 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index b8165795a9..611bf2fe0c 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -9,6 +9,14 @@
#include "include/config.h"
#include "../replace/replace.h"
+#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4"}
+
+#define VERSION "Samba"
+
+#define PACKAGE VERSION
+#define PACKAGE_BUGREPORT "https://bugzilla.samba.org/"
+#define PACKAGE_VERSION VERSION
+
#define RCSID(msg) struct __rcsid { int __rcsdi; }
#define KRB5
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 13989146d9..10d085cbd9 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -21,10 +21,6 @@
/* We want PKINIT */
#define PKINIT 1
-#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4"}
-
-#define VERSION "Samba"
-
#define ROKEN_LIB_FUNCTION
#define ROKEN_LIB_CALL
#define GETHOSTBYADDR_PROTO_COMPATIBLE
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index e08186a6f5..574a3e6f44 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -483,7 +483,6 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
HEIMDAL_BINARY('rkpty', 'lib/roken/rkpty.c',
deps='roken',
- cflags='-DPACKAGE="Samba"',
install=False
)
diff --git a/source4/wscript b/source4/wscript
index c419c16af2..deb5a9ede8 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -63,13 +63,6 @@ def set_options(opt):
def configure(conf):
version = load_version(have_git=True)
- conf.DEFINE('PACKAGE_NAME', 'samba', quote=True)
- conf.DEFINE('PACKAGE_STRING', 'Samba ' + version.STRING, quote=True)
- conf.DEFINE('PACKAGE_TARNAME', 'samba', quote=True)
- conf.DEFINE('PACKAGE_URL', "http://www.samba.org/", quote=True)
- conf.DEFINE('PACKAGE_VERSION', version.STRING, quote=True)
- conf.DEFINE('PACKAGE_BUGREPORT', 'http://bugzilla.samba.org/', quote=True)
-
conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)