From cd08ed589bf33c071e916222e230d6f8a58efa8d Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sun, 7 Dec 2003 05:39:23 +0000 Subject: [PATCH] Make physfs itself not link against readline and ncurses (just test_physfs). --- configure.in | 3 ++- test/Makefile.am | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 7cb5f395..6aeaed01 100644 --- a/configure.in +++ b/configure.in @@ -219,7 +219,7 @@ if test x$enable_readline = xyes; then if test x$have_readline_hdr = xyes -a x$have_readline_lib = xyes; then if test x$have_history_hdr = xyes -a x$have_history_lib = xyes; then AC_DEFINE([PHYSFS_HAVE_READLINE], 1, [define if we have readline]) - LIBS="$LIBS -lreadline -lcurses" + have_readline="yes" fi fi fi @@ -489,6 +489,7 @@ AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes) AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes) AM_CONDITIONAL(BUILD_BEOS, test x$this_is_beos = xyes) AM_CONDITIONAL(BUILD_CYGWIN, test x$this_is_cygwin = xyes) +AM_CONDITIONAL(BUILD_READLINE, test x$have_readline = xyes) AC_OUTPUT([ Makefile diff --git a/test/Makefile.am b/test/Makefile.am index 139a1c5b..3b9d1577 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,6 +4,10 @@ bin_PROGRAMS = test_physfs INCLUDES = -I$(top_srcdir) +if BUILD_READLINE +test_physfs_LDFLAGS="-lreadline -lcurses" +endif + test_physfs_LDADD = ../libphysfs.la test_physfs_SOURCES = test_physfs.c