configure: Fix config.h

PACKAGE_VERSION was accidentially redefined which rendered all compiler
checks broken which then wiped out all custom CFLAGS that we have been
using.

This patch adds a new variable with the full version which fixes the
problem.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/configure.ac b/configure.ac
index f44d010ca2eb6d089b518919fc2c4c787237a221..8c95a7a38336e4027d9b31dec9655a22ce2b7ed3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AC_ARG_WITH([release],
        [PACKAGE_RELEASE=$withval], [PACKAGE_RELEASE=""])
 
 AC_DEFINE_UNQUOTED(
-       [PACKAGE_VERSION],
+       [PACKAGE_FULLVERSION],
        ["$PACKAGE_VERSION$PACKAGE_RELEASE"],
        [The package version string])
 

diff --git a/src/cli/lib/version.c b/src/cli/lib/version.c
index 0a8dc5ca46d14ad149274b25354dd82b394038c5..c44a0bd5bd05b1d738e5da03fe6e9d2ddff1bb08 100644 (file)
--- a/src/cli/lib/version.c
+++ b/src/cli/lib/version.c
@@ -24,5 +24,5 @@
 #include "version.h"
 
 void cli_version(void) {
-       printf("%s %s\n", program_invocation_short_name, PACKAGE_VERSION);
+       printf("%s %s\n", program_invocation_short_name, PACKAGE_FULLVERSION);
 }

diff --git a/src/cli/pakfire-builder.c b/src/cli/pakfire-builder.c
index 1e0890dc5d68079ef9b2e50ccc2bce7830d42e10..5cc8a935c69e965945e4ad7b3fba2b1b3f69347a 100644 (file)
--- a/src/cli/pakfire-builder.c
+++ b/src/cli/pakfire-builder.c
@@ -50,7 +50,7 @@
 #include "lib/terminal.h"
 #include "lib/version.h"
 
-const char* argp_program_version = PACKAGE_VERSION;
+const char* argp_program_version = PACKAGE_FULLVERSION;
 
 enum {
        OPT_ARCH         = 1,

diff --git a/src/cli/pakfire-client.c b/src/cli/pakfire-client.c
index 14828a1088f3da92d69dd1ea0eb2165407006a0d..4666e95dd505a3b3996e94d771ece350dc50dd5e 100644 (file)
--- a/src/cli/pakfire-client.c
+++ b/src/cli/pakfire-client.c
@@ -31,7 +31,7 @@
 #include "lib/repo.h"
 #include "lib/upload.h"
 
-const char* argp_program_version = PACKAGE_VERSION;
+const char* argp_program_version = PACKAGE_FULLVERSION;
 
 static const struct command commands[] = {
        { "build",  cli_client_build, 1, -1, 0 },

diff --git a/src/cli/pakfire-daemon.c b/src/cli/pakfire-daemon.c
index 9ca414cf16b42ab3ea58a839b9b0ea4bb4bb74da..a818a3028763b6076afe68ade7bb0df63872b1db 100644 (file)
--- a/src/cli/pakfire-daemon.c
+++ b/src/cli/pakfire-daemon.c
@@ -28,7 +28,7 @@
 #include "lib/command.h"
 #include "lib/daemon.h"
 
-const char* argp_program_version = PACKAGE_VERSION;
+const char* argp_program_version = PACKAGE_FULLVERSION;
 
 static const char* doc = "The Pakfire Build Daemon";
 

diff --git a/src/cli/pakfire.c b/src/cli/pakfire.c
index bde3e06a6aad0ee88e7e6e5341e1f6c3e3f55d5e..d60023f7d40125e196f6f396ea202811ceae2d11 100644 (file)
--- a/src/cli/pakfire.c
+++ b/src/cli/pakfire.c
@@ -39,7 +39,7 @@
 
 #define MAX_REPOS 16
 
-const char* argp_program_version = PACKAGE_VERSION;
+const char* argp_program_version = PACKAGE_FULLVERSION;
 
 static const char* args_doc =
        "install  PACKAGES...\n"

diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index 006706406c6d7f4cff1d214de38a9d76d1100bfb..923926c28d043671efb218f486af87d2c404caf1 100644 (file)
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -669,7 +669,7 @@ static int pakfire_daemon_connect(sd_event_source* s, uint64_t usec, void* data)
                goto ERROR;
 
        // Send our version
-       r = pakfire_xfer_add_query(xfer, "version", "%s", PACKAGE_VERSION);
+       r = pakfire_xfer_add_query(xfer, "version", "%s", PACKAGE_FULLVERSION);
        if (r < 0)
                goto ERROR;
 

diff --git a/src/python/pakfiremodule.c b/src/python/pakfiremodule.c
index 8069958a9940777b811d82d3fa595c1e0f52ff80..d32602d0beb753e9966833c574d270e264b04306 100644 (file)
--- a/src/python/pakfiremodule.c
+++ b/src/python/pakfiremodule.c
@@ -131,7 +131,7 @@ PyMODINIT_FUNC PyInit_pakfire(void) {
                return NULL;
 
        // Add the version
-       r = PyModule_AddStringConstant(module, "__version__", PACKAGE_VERSION);
+       r = PyModule_AddStringConstant(module, "__version__", PACKAGE_FULLVERSION);
        if (r < 0)
                goto ERROR;