Added a set of per binary LDFLAGS parameters.

Added two optional variables PSPP_LDFLAGS and PSPPIRE_LDFLAGS for the convenience of package creators who need to be able to pass flags to one program but not the other.

diff --git a/configure.ac b/configure.ac
index f32434daec6071150821c6985852f8f3b2af4166..3284ec818d32a5ebbfadfd5d6b5e8d39f5d04e93 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,10 @@ PSPP_LC_PAPER
 AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
 
 
+AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary only])
+AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only])
+
+
 AC_ARG_WITH(
   gui, 
   [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 64fe75e7cbaa3c6f17499ecdd1259bc38f1b7299..8dabffbf695e643da35d7e63c5dfcf390ea1b2ab 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -7,6 +7,7 @@ src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
 
 
 src_ui_gui_psppire_LDFLAGS = \
+       $(PSPPIRE_LDFLAGS) \
        $(PG_LDFLAGS)
 
 

diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 928716c851241fd365199895bcb3f0d29c06cb5c..80c6599ab9704c061c6e181bfc13b2b9ee92230f 100644 (file)
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -40,7 +40,7 @@ src_ui_terminal_pspp_LDADD = \
 
 
 
-src_ui_terminal_pspp_LDFLAGS = $(PG_LDFLAGS)
+src_ui_terminal_pspp_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
 
 if RELOCATABLE_VIA_LD
 src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`