From 6cd788c3c3fcc7ab22bcba07b84aeb1119a06a7e Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 3 Jun 2012 22:42:42 +0200 Subject: [PATCH] Fix --with-curses configure option. We only honored the provided -L for the tests in configure but not when linking para_gui. This patch creates an output variable, gui_ldflags, which is used in the Makefile for linking para_gui. --- Makefile.in | 2 +- configure.ac | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index d577ce29..173b81a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -256,7 +256,7 @@ para_client: $(client_objs) para_gui: $(gui_objs) @[ -z "$(Q)" ] || echo 'LD $@' - $(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) -lcurses + $(Q) $(CC) $(LDFLAGS) -o $@ $(gui_objs) @gui_ldflags@ para_audiod: $(audiod_objs) @[ -z "$(Q)" ] || echo 'LD $@' diff --git a/configure.ac b/configure.ac index b9875747..760a52a7 100644 --- a/configure.ac +++ b/configure.ac @@ -475,6 +475,7 @@ AC_CHECK_LIB([curses], [initscr], [], [ have_curses="no" ]) if test "$have_curses" = "yes"; then + gui_ldflags="$curses_libs -lcurses" AC_SUBST(curses_cppflags) AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on curses support]) extras="$extras gui" @@ -1243,6 +1244,7 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS, objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc) AC_SUBST(gui_objs, add_dot_o($gui_objs)) +AC_SUBST(gui_ldflags, $gui_ldflags) AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS, objlist_to_errlist($gui_errlist_objs), errors used by para_gui) -- 2.39.5