From a8a3c116e11baa5470c5c6ba2897ed4fb2a6bc5d Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 31 Aug 2006 23:49:40 +0000 Subject: [PATCH] Only build wchar replacement funcs when necessary. Add space after mode argument to install-sh. --- Makefile.am | 11 ++++++----- configure.in | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 42b9149ed..c94086bcd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ mutt_SOURCES = $(BUILT_SOURCES) \ rfc822.c rfc1524.c rfc2047.c rfc2231.c \ score.c send.c sendlib.c signal.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ - muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \ + muttlib.c editmsg.c mbyte.c \ url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ @@ -60,10 +60,11 @@ CPPFLAGS=@CPPFLAGS@ -I$(includedir) EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \ mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \ pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \ - browser.h mbyte.h remailer.h url.h \ + smtp.c browser.h mbyte.h remailer.h url.h \ crypt-mod-pgp-classic.c crypt-mod-smime-classic.c \ pgppacket.c mutt_idna.h hcache.h hcache.c bcache.c bcache.h mutt_ssl_gnutls.c \ - crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c + crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c \ + utf8.c wcwidth.c EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ configure account.h \ @@ -142,8 +143,8 @@ install-exec-hook: install-data-local: Muttrc $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) - $(INSTALL) -m644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist - $(INSTALL) -m644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist + $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist + $(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \ mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \ elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \ diff --git a/configure.in b/configure.in index ad142bb70..482463100 100644 --- a/configure.in +++ b/configure.in @@ -1108,6 +1108,8 @@ fi if test $wc_funcs = yes; then AC_DEFINE(HAVE_WC_FUNCS,1,[ Define if you are using the system's wchar_t functions. ]) +else + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS utf8.o wcwidth.o" fi AC_CACHE_CHECK([for nl_langinfo and CODESET], mutt_cv_langinfo_codeset, -- 2.40.0