From: Andre Noll <maan@systemlinux.org>
Date: Fri, 13 Sep 2013 06:18:01 +0000 (+0000)
Subject: build: ldflags conversion: libreadline.
X-Git-Tag: v0.5.1~1^2~36
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=7de07ae2e268280bf63decf60c287f060883f8e3;hp=0e9f1c52f1a197d295c5bed489366f9124be9462

build: ldflags conversion: libreadline.

This also renames readline_libs to readline_ldflags, just to make
the naming more consistent to the other tests.
---

diff --git a/Makefile.in b/Makefile.in
index 833af847..6e7cc2de 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,6 +33,7 @@ flac_ldflags := @flac_ldflags@
 oss_ldflags := @oss_ldflags@
 alsa_ldflags := @alsa_ldflags@
 ao_ldflags := @ao_ldflags@
+readline_ldflags := @readline_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -269,6 +270,7 @@ endif
 para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_audiod para_filter para_play: LDFLAGS += $(mad_ldflags)
 para_write para_play para_audiod: LDFLAGS += $(ao_ldflags)
+para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
 
 para_write \
 para_play \
diff --git a/configure.ac b/configure.ac
index d72b9797..bbd07609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1026,7 +1026,7 @@ if test "$have_curses" != "yes"; then
 fi
 
 if test "$have_readline" = "yes"; then
-	readline_libs="$readline_libs -lreadline"
+	readline_ldflags="$readline_libs -lreadline"
 	AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [have_readline="no"])
 	if test "$have_readline" = "no"; then # try with -lcurses
                 # clear cache
@@ -1034,7 +1034,7 @@ if test "$have_readline" = "yes"; then
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_libs="$readline_libs -lcurses"
+			readline_ldflags="$readline_ldflags -lcurses"
 		], [], [-lcurses])
 	fi
 	if test "$have_readline" = "no"; then # try with -ltermcap
@@ -1043,19 +1043,17 @@ if test "$have_readline" = "yes"; then
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_libs="$readline_libs -ltermcap"
+			readline_ldflags="$readline_ldflags -ltermcap"
 		], [], [-ltermcap])
 	fi
 fi
 
 if test "$have_readline" = "yes"; then
+	AC_SUBST(readline_cppflags)
+	AC_SUBST(readline_ldflags)
 	client_errlist_objs="$client_errlist_objs interactive"
-	client_ldflags="$client_ldflags $readline_libs"
 	audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
-	audioc_ldflags="$audioc_ldflags $readline_libs"
 	play_errlist_objs="$play_errlist_objs interactive"
-	play_ldflags="$play_ldflags $readline_libs"
-	AC_SUBST(readline_cppflags)
 	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
 	AC_MSG_WARN([libreadline not found or unusable])