From 737dcd56a5217313cb44d9532fa8e0d315baeed5 Mon Sep 17 00:00:00 2001
From: Amaa <Amaa>
Date: Fri, 3 Jul 2026 20:19:00 +0000
Subject: [PATCH] Add an option to put the application path definitions in the
 config.h (with default values): Added the --enable-ide-integration autogen
 option to enable putting the application path definitions (with default
 values) in the config.h file. This is useful for cases where the development
 tools fail due to those symbols not being defined.

---
 common/Makefile.am |  4 +---
 configure.ac       | 20 ++++++++++++++++++++
 gtk/Makefile.am    |  6 +-----
 tests/Makefile.am  |  4 +---
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 1ef59e70e..fcb10f614 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -3,9 +3,7 @@
 noinst_LIBRARIES = libsynaptic.a
 
 AM_CPPFLAGS = -I@top_srcdir@ -I@top_srcdir@/common -I@top_srcdir@/gtk -I@top_builddir@ \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-	-DSYNAPTICSTATEDIR=\""$(localstatedir)"\" \
+	@SYNAPTIC_APP_PATHS@ \
 	@GTK_DISABLE_DEPRECATED@ \
 	@GTK_CFLAGS@ \
 	@VTE_CFLAGS@ \
diff --git a/configure.ac b/configure.ac
index 2cc1accaf..0a5383ad2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,26 @@ AC_ARG_WITH(launchpad-integration,
 	]
 )
 
+# IDEs and code analisys tools need to know about the externally defined symbols,
+# so, for those scenarios, here those are added to the config.h file with default values.
+# Otherwise they're injected at build time (through the -D command line arguments in the makefiles).
+AC_ARG_ENABLE(ide-integration, [  --enable-ide-integration: Define default values in config.h for the injected symbols for the IDEs and code analisys tools.])
+AS_IF([test "x$enable_ide_integration" = "xyes"],
+    [
+        # These default values define relative paths to the current folder (i.e., where the executable is).
+        AC_DEFINE(PACKAGE_DATA_DIR, "./share", Default value for the IDEs and code analisys tools.)
+        AC_DEFINE(PACKAGE_LOCALE_DIR, "./share/locale", Default value for the IDEs and code analisys tools.)
+        AC_DEFINE(SYNAPTICSTATEDIR, "./var", Default value for the IDEs and code analisys tools.)
+        AC_DEFINE(SYNAPTIC_GTKBUILDERDIR, "./gtkbuilder/", Default value for the IDEs and code analisys tools.)
+        AC_DEFINE(SYNAPTIC_PIXMAPDIR, "./pixmaps/", Default value for the IDEs and code analisys tools.)
+    ],
+    [
+        # The paths defined here are replaced at make time by the standard values (as defined by GNU for the "Variables for Installation Directories").
+        # They can be adjusted by passing the --prefix option to autogen.
+        AC_SUBST(SYNAPTIC_APP_PATHS,'-DPACKAGE_DATA_DIR=\""${datadir}"\" -DPACKAGE_LOCALE_DIR=\""${localedir}"\" -DSYNAPTICSTATEDIR=\""${localstatedir}"\" -DSYNAPTIC_GTKBUILDERDIR=\""${datadir}/synaptic/gtkbuilder/"\" -DSYNAPTIC_PIXMAPDIR=\""${datadir}/synaptic/pixmaps/"\"')
+    ]
+)
+
 AC_ARG_WITH(pkg-hold,
         [  --with-pkg-hold: Build with experimental package "hold" feature],
         AC_DEFINE(SYNAPTIC_PKG_HOLD, 1, [build with package pin feature])
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1545b5a3b..fcae27c7f 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -2,11 +2,7 @@ SUBDIRS = gtkbuilder
 
 
 AM_CPPFLAGS = -I@top_srcdir@ -I@top_srcdir@/common -I@top_srcdir@/gtk -I@top_builddir@ \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-	-DSYNAPTICSTATEDIR=\""$(localstatedir)"\" \
-	-DSYNAPTIC_GTKBUILDERDIR=\""$(datadir)/synaptic/gtkbuilder/"\" \
-	-DSYNAPTIC_PIXMAPDIR=\""$(datadir)/synaptic/pixmaps/"\" \
+	@SYNAPTIC_APP_PATHS@ \
 	@GTK_DISABLE_DEPRECATED@ \
 	@GTK_CFLAGS@ \
 	@VTE_CFLAGS@ \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 08cea2600..ef970baec 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,6 @@
 
 AM_CPPFLAGS = -I@top_srcdir@ -I@top_srcdir@/common -I@top_srcdir@/gtk -I@top_builddir@ \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-	-DSYNAPTICSTATEDIR=\""$(localstatedir)"\" \
+	@SYNAPTIC_APP_PATHS@ \
 	@GTK_DISABLE_DEPRECATED@ \
 	@GTK_CFLAGS@ \
 	@VTE_CFLAGS@ \