From: Thomas Roessler <roessler@does-not-exist.org>
Date: Sun, 4 Oct 1998 09:26:12 +0000 (+0000)
Subject: More fixes to the build process.  This version was tested to build
X-Git-Tag: mutt-0-94-10i-rel~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40ed305aa5185ad2ebc6d5f5f0408fdb5696b5ee;p=mutt

More fixes to the build process.  This version was tested to build
cleanly under SuSE Linux and IRIX.
---

diff --git a/Makefile.am b/Makefile.am
index 3f8d0627..d004f862 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,9 @@ mutt_SOURCES =	addrbook.c alias.c attach.c browser.c buffy.c color.c \
 	postpone.c query.c recvattach.c rfc822.c \
 	rfc1524.c rfc2047.c score.c send.c sendlib.c signal.c sort.c \
 	status.c system.c thread.c charset.c history.c lib.c
-	
-mutt_LDADD = @MUTT_LIB_OBJECTS@
-mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@
+
+mutt_LDADD = @MUTT_LIB_OBJECTS@ $(INTLLIBS)
+mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ $(INTLDEPS)
 
 EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
 	gnupgparse.c resize.c snprintf.c dotlock.c pop.c imap.c socket.c
diff --git a/configure b/configure
index ed9e070d..709ebf73 100755
--- a/configure
+++ b/configure
@@ -5097,6 +5097,8 @@ fi
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
   
+CPPFLAGS="$CPPFLAGS -I \$(srcdir)/intl"
+
 MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
 
 cat >> confdefs.h <<EOF
diff --git a/configure.in b/configure.in
index efb49c4e..242f5a6b 100644
--- a/configure.in
+++ b/configure.in
@@ -441,6 +441,8 @@ AC_ARG_ENABLE(exact-address, [  --enable-exact-address     enable regeneration o
 AC_SUBST(MUTT_LIB_OBJECTS)
 
 AM_GNU_GETTEXT
+CPPFLAGS="$CPPFLAGS -I \$(srcdir)/intl"
+
 MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
 AC_SUBST(MUTTLOCALEDIR)
 AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR")