From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 12 May 2011 02:31:22 +0000 (-0700)
Subject: configure: Use $LIB<x> for linking a program, not $LTLIB<x>.
X-Git-Tag: v0.7.9~296
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3dc389d453a81ffd3957662e287c96b3a73c4bb;p=pspp-builds.git

configure: Use $LIB<x> for linking a program, not $LTLIB<x>.

The gettext manual says:

     `@LIBINTL@' is for use without `libtool', `@LTLIBINTL@' is for
     use with `libtool'

It has similar wording for libiconv.

Since there's lots of libtool-related stuff in the PSPP makefiles, I
assumed that PSPP needed $LTLIB<x>.  But it now appears that this is
only correct for linking a libtool library, not for linking a
program that links against libtool libraries.

On GNU/Linux, both $LIB<x> and $LTLIB<x> expand to the empty string,
so I couldn't tell from experimenting there.

This should fix link failures with Mingw, reported by Harry Thijssen
<pspp@sjpaes.nl>.
---

diff --git a/configure.ac b/configure.ac
index 35337d6c..eb10e560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ PSPP_PERL
 dnl Disable automatic po/ support, because PSPP provides its own po/ support.
 AC_PROVIDE([AM_PO_SUBDIRS])
 AM_GNU_GETTEXT([external], [need-ngettext])
-LIBS="$LTLIBINTL $LIBS"
+LIBS="$LIBINTL $LIBS"
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
@@ -327,7 +327,7 @@ AM_ICONV
 if test "$am_cv_func_iconv" != "yes"; then
    PSPP_REQUIRED_PREREQ([iconv (see http://www.gnu.org/software/libiconv/)])
 fi
-LIBS="$LTLIBICONV $LIBS"
+LIBS="$LIBICONV $LIBS"
 
 dnl Required by the gnulib 'relocatable-prog' module.
 dnl See doc/relocatable-maint.texi in the gnulib tree for details.