From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 Jan 2025 16:22:57 +0000 (+0000)
Subject: configure: Fix config.h
X-Git-Tag: 0.9.30~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac6339990c2b9d7d77f857f6002bbfc03739dab;p=pakfire.git

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 f44d010ca..8c95a7a38 100644
--- 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 0a8dc5ca4..c44a0bd5b 100644
--- 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 1e0890dc5..5cc8a935c 100644
--- 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 14828a108..4666e95dd 100644
--- 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 9ca414cf1..a818a3028 100644
--- 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 bde3e06a6..d60023f7d 100644
--- 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 006706406..923926c28 100644
--- 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 8069958a9..d32602d0b 100644
--- 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;