From 42813eeb841ea4a5dbb94e35fb481a163b486d77 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 29 Mar 2014 23:28:11 +0800
Subject: [PATCH] configure/Makefile: remove unused $LIBS and $LDFLAGS
 complications

---
 Makefile.in  | 19 +++++++++----------
 configure.ac | 35 -----------------------------------
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3063438c2..a39b4bb56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,11 +54,10 @@ localedir = @localedir@
 
 MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\"
 CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@
-LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@
-LDFLAGS_FISHD = ${LDFLAGS} @LIBS_FISHD@
-LDFLAGS_MIMEDB = ${LDFLAGS} @LIBS_MIMEDB@
+LIBS = @LIBS@
+LDFLAGS_FISH = ${LDFLAGS} @LDFLAGS_FISH@
 
 #
 # Set to 1 if we have gettext
@@ -686,7 +685,7 @@ uninstall-translations:
 #
 
 fish: $(FISH_OBJS) fish.o
-	$(CXX) $(CXXFLAGS) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_OBJS) fish.o $(LIBS) -o $@
 
 
 #
@@ -694,7 +693,7 @@ fish: $(FISH_OBJS) fish.o
 #
 
 fishd: $(FISHD_OBJS)
-	$(CXX) $(CXXFLAGS) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(FISHD_OBJS) $(LIBS) -o $@
 
 
 #
@@ -702,7 +701,7 @@ fishd: $(FISHD_OBJS)
 #
 
 fish_tests: $(FISH_TESTS_OBJS)
-	$(CXX) $(CXXFLAGS) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_TESTS_OBJS) $(LIBS) -o $@
 
 
 #
@@ -710,7 +709,7 @@ fish_tests: $(FISH_TESTS_OBJS)
 #
 
 mimedb: $(MIME_OBJS)
-	$(CXX) $(CXXFLAGS) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(MIME_OBJS) $(LIBS) -o $@
 
 
 #
@@ -718,7 +717,7 @@ mimedb: $(MIME_OBJS)
 #
 
 fish_indent: $(FISH_INDENT_OBJS)
-	$(CXX) $(CXXFLAGS) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(FISH_INDENT_OBJS) $(LIBS) -o $@
 
 
 #
@@ -726,7 +725,7 @@ fish_indent: $(FISH_INDENT_OBJS)
 #
 
 key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o
-	$(CXX) $(CXXFLAGS) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LIBS) -o $@
 
 
 #
diff --git a/configure.ac b/configure.ac
index 91f4f88cb..ccabf62db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,6 @@ conf_arg=$@
 AC_SUBST(HAVE_GETTEXT)
 AC_SUBST(HAVE_DOXYGEN)
 AC_SUBST(LDFLAGS_FISH)
-AC_SUBST(LIBS_FISH)
-AC_SUBST(LIBS_FISH_INDENT)
-AC_SUBST(LIBS_FISHD)
-AC_SUBST(LIBS_MIMEDB)
 
 
 #
@@ -414,37 +410,6 @@ if test x$local_gettext != xno; then
   AC_SEARCH_LIBS( gettext, intl,,)
 fi
 
-LIBS_SHARED=$LIBS
-
-#
-# Check for libraries needed by fish.
-#
-
-LIBS="$LIBS_SHARED"
-LIBS_FISH=$LIBS
-
-#
-# Check for libraries needed by fish_indent.
-#
-
-LIBS="$LIBS_SHARED"
-LIBS_FISH_INDENT=$LIBS
-
-#
-# Check for libraries needed by fishd.
-#
-
-LIBS="$LIBS_SHARED"
-LIBS_FISHD=$LIBS
-
-#
-# Check for libraries needed by mimedb.
-#
-
-LIBS="$LIBS_SHARED"
-LIBS_MIMEDB=$LIBS
-
-
 #
 # Check presense of various header files
 #