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

diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index b8165795a925e691b382eabe2cae632e250d1b14..611bf2fe0c90344aee4bad2819962a6481cc740f 100644 (file)
--- 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 13989146d9643dad6a10a055eab948492331ca64..10d085cbd9a1fbb724c80ddcef3b9f5536432235 100644 (file)
--- 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 e08186a6f5651186c94cae2bdf890a46cfa2c12f..574a3e6f4492f22f92e2a4e1b2138f87f24c4fba 100644 (file)
--- 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 c419c16af2bf49282a39304e52b2bf3292728d33..deb5a9ede8e00236c962251e6257b062bc2e1f18 100644 (file)
--- 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)