Fix some problems with autoconf (#793)

* build: restore tabs in configure.ac

No functional changes

* build: fix out-of-tree build

* Built items in /doc weren't being installed.
* Force install to /usr/lib, not /usr/lib64

* build: stop yes/no include dirs

A bug in the curses detection often lead to things like:
* -Ino/include  -Lno/lib
* -Iyes/include -Lyes/lib

diff --git a/Makefile.am b/Makefile.am
index 0f4343cafd4016064814456ef5f308c3ffacb365..b00d1f8ac1927c236b7f05f4daf48396a83c4285 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,21 +137,21 @@ git_ver.h: $(neomutt_SOURCES) $(SUBDIRS)
 install-data-local:
        $(MKDIR_P) $(DESTDIR)$(sysconfdir)
        -if test -n "$(SMIMEAUX_TARGET)"; then \
-               $(MKDIR_P) $(DESTDIR)$(libdir)/$(PACKAGE); \
+               $(MKDIR_P) $(DESTDIR)$(exec_prefix)/lib/$(PACKAGE); \
                for i in $(SMIMEAUX_TARGET); do \
-                       $(INSTALL) -m 755 $(srcdir)/$$i $(DESTDIR)$(libdir)/$(PACKAGE); \
+                       $(INSTALL) -m 755 $$i $(DESTDIR)$(exec_prefix)/lib/$(PACKAGE); \
                done \
        fi
        -if test -n "$(PGPAUX_TARGET)"; then \
-               $(MKDIR_P) $(DESTDIR)$(libdir)/$(PACKAGE); \
+               $(MKDIR_P) $(DESTDIR)$(exec_prefix)/lib/$(PACKAGE); \
                for i in $(PGPAUX_TARGET); do \
-                       $(INSTALL) -m 755 $$i $(DESTDIR)$(libdir)/$(PACKAGE); \
+                       $(INSTALL) -m 755 $$i $(DESTDIR)$(exec_prefix)/lib/$(PACKAGE); \
                done \
        fi
 
 uninstall-local:
        for i in smime_keys $(PGPAUX_TARGET); do \
-               rm -fr $(DESTDIR)$(libdir)/$(PACKAGE)/$$i; \
+               rm -fr $(DESTDIR)$(exec_prefix)/lib/$(PACKAGE)/$$i; \
        done
 
 distclean-local:

diff --git a/configure.ac b/configure.ac
index cf133e45fe8825915704d0b4f0eccb3e72c9f46c..0299f9215a829825f2e06c9e7399216577b29cd4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@ AS_IF([test x$use_pgp != "xno"], [
 dnl --enable-smime
 AS_IF([test x$use_smime != "xno"], [
        AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME, 1, [Define if you want classic S/MIME support.])
-       SMIMEAUX_TARGET='$(top_srcdir)/contrib/smime_keys'
+       SMIMEAUX_TARGET='$(srcdir)/contrib/smime_keys'
        build_ncrypt_smime="yes"
 ])
 
@@ -357,17 +357,17 @@ main ()
                [AC_MSG_ERROR(unable to compile.  check config.log)], -lm)
 else
 dnl --- ncurses
-       dnl Plese note that --with-slang=no --with-curses=no will result in
+       dnl Please note that --with-slang=no --with-curses=no will result in
        dnl configure trying to locate curses at /no/include first. The mutual
        dnl exclusion of slang and curses and the requirement that one (and only
        dnl one) is chosen could be improved.
-    if test x$with_curses != xyes; then
-        mutt_cv_curses=$withval
-    fi
-    if test x$mutt_cv_curses != x/usr; then
-        LDFLAGS="$LDFLAGS -L${with_curses}/lib"
-        CPPFLAGS="$CPPFLAGS -I${with_curses}/include"
-    fi
+       if test x$with_curses != xyes -a x$with_curses != xno; then
+               mutt_cv_curses=$withval
+       fi
+       if test x$mutt_cv_curses != x/usr -a x$mutt_cv_curses != x; then
+               LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib"
+               CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include"
+       fi
        mutt_cv_curses=/usr
        AC_CHECK_FUNC(initscr,,[
                cf_ncurses=""
@@ -843,7 +843,7 @@ AM_GNU_GETTEXT([external])
 
 AM_ICONV
 if test "$am_cv_func_iconv" != yes; then
-    AC_MSG_ERROR([An iconv implementation is required])
+       AC_MSG_ERROR([An iconv implementation is required])
 fi
 
 AC_ARG_WITH(idn, AS_HELP_STRING([--with-idn=@<:@PFX@:>@],[Use GNU libidn for internationalized domain names]),
@@ -858,29 +858,29 @@ AC_ARG_WITH(idn, AS_HELP_STRING([--with-idn=@<:@PFX@:>@],[Use GNU libidn for int
                [with_idn=auto])
 
 if test "x$with_idn" != "xno"; then
-    dnl Solaris 11 has /usr/include/idn
-    have_stringprep_h=no
-    AC_CHECK_HEADERS([stringprep.h idn/stringprep.h], [
-                have_stringprep_h=yes
-                break])
-    have_idna_h=no
-    AC_CHECK_HEADERS([idna.h idn/idna.h], [
-                have_idna_h=yes
-                break])
-
-    AC_SEARCH_LIBS([stringprep_check_version], [idn], [
-        AC_DEFINE([HAVE_LIBIDN], 1, [Define to 1 if you have the GNU idn library])
-
-        LIBS="$LIBS $LIBICONV"
-        AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z)
-        AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z)
-        AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
-    ])
-
-    if test "$with_idn" != auto; then
-        if test $have_stringprep_h = no || test $have_idna_h = no || test $ac_cv_search_stringprep_check_version = no; then
-            AC_MSG_ERROR([IDN was requested, but libidn was not usable on this system])
-        fi
+       dnl Solaris 11 has /usr/include/idn
+       have_stringprep_h=no
+       AC_CHECK_HEADERS([stringprep.h idn/stringprep.h], [
+               have_stringprep_h=yes
+               break])
+       have_idna_h=no
+       AC_CHECK_HEADERS([idna.h idn/idna.h], [
+               have_idna_h=yes
+               break])
+
+       AC_SEARCH_LIBS([stringprep_check_version], [idn], [
+               AC_DEFINE([HAVE_LIBIDN], 1, [Define to 1 if you have the GNU idn library])
+
+               LIBS="$LIBS $LIBICONV"
+               AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z)
+               AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z)
+               AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale)
+       ])
+
+       if test "$with_idn" != auto; then
+               if test $have_stringprep_h = no || test $have_idna_h = no || test $ac_cv_search_stringprep_check_version = no; then
+                       AC_MSG_ERROR([IDN was requested, but libidn was not usable on this system])
+               fi
        fi
 fi
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b3bb7364c5f0bd6b17281c6dc85d7914641986d6..cbb5efec270b9b5e9413a3b162c7cb56a30a5a78 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -54,9 +54,9 @@ install-data-local: makedoc-all
        for f in $(srcdir_DOCFILES); do \
                $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir); \
        done
-       -$(INSTALL) -m 644 $(srcdir)/manual.txt $(DESTDIR)$(docdir)
+       -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
        -for f in $(HTML_DOCFILES); do \
-               $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir); \
+               $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir); \
        done
        $(INSTALL) -m 644 neomuttrc $(DESTDIR)$(sysconfdir)/neomuttrc
        -$(INSTALL) -m 644 $(srcdir)/neomutt-syntax.vim $(DESTDIR)$(docdir)