Note that mhshow-suffix/mhshow- matching is case-insenstive.

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1d42bf53bf6a4ba207b88d59da1fdfd9ddea0feb..1f8dc6c8e60cac153c7054a9cab9a1b2432d3a60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,3 @@
-dnl

 dnl configure.ac -- autoconf template for nmh
 dnl
 
 dnl configure.ac -- autoconf template for nmh
 dnl
 


@@ -12,7 +11,7 @@ AM_INIT_AUTOMAKE([-Wall foreign serial-tests subdir-objects 1.12])
 AC_CANONICAL_HOST
 
 AC_MSG_NOTICE([configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION])
 AC_CANONICAL_HOST
 
 AC_MSG_NOTICE([configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION])

-AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl
+AC_SUBST([VERSION], [AC_PACKAGE_VERSION])dnl

 
 dnl What date of nmh are we building?
 DATE=`cat ${srcdir}/DATE`
 
 dnl What date of nmh are we building?
 DATE=`cat ${srcdir}/DATE`


@@ -35,9 +34,9 @@ AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != xyes -a \
 dnl Do you want client-side support for encryption with TLS?
 AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
 
 dnl Do you want client-side support for encryption with TLS?
 AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
 

-dnl Do you want client-side support for using OAuth2 for SMTP authentication?
+dnl Do you want client-side support for using OAuth2 for SMTP & POP auth?

 AC_ARG_WITH([oauth], AS_HELP_STRING([--with-oauth],
 AC_ARG_WITH([oauth], AS_HELP_STRING([--with-oauth],

-  [Enable OAuth2 support in SMTP auth]))
+  [Enable OAuth2 support in SMTP and POP auth]))

 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],
 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],


@@ -154,20 +153,6 @@ dnl Check for any platform-specific additional AM_CPPFLAGS.  This depends on
 dnl MULTIBYTE_ENABLED having already been set.
 NMH_ADDL_CPPFLAGS
 
 dnl MULTIBYTE_ENABLED having already been set.
 NMH_ADDL_CPPFLAGS
 

-if test "$GCC" = yes; then
-  dnl Do this regardless of auto_cflags value.
-  dnl Enable _FORTIFY_SOURCE checking, which is supported by
-  dnl gcc 4.1 and later, but only when optimization is enabled.
-  dnl It shouldn't hurt with earlier versions because it's a cpp macro.
-  dnl If the user configures with a CFLAGS that contains a -O flag
-  dnl but then removes it a make time, they'll also have to remove
-  dnl -D_FORTIFY_SOURCE from AM_CPPFLAGS because it requires optimization.
-  dnl Use "\ " instead of ' ' or " " for compatiblity with posh.
-  AS_CASE([$CFLAGS],
-          [-O|*\ -O|-O[[!0]]*|*\ -O[[!0]]*],
-          [AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-D_FORTIFY_SOURCE=2"])
-fi
-

 dnl FreeBSD needs a bit of magic to bring getline() into scope.
 dnl We do this here rather than in (say) h/mh.h because this macro must
 dnl be defined before <stdio.h> is pulled in.
 dnl FreeBSD needs a bit of magic to bring getline() into scope.
 dnl We do this here rather than in (say) h/mh.h because this macro must
 dnl be defined before <stdio.h> is pulled in.


@@ -355,7 +340,7 @@ NMH_CHECK_ICONV
 dnl Check for tputs() callback argument
 NMH_TPUTS_PUTC_ARG
 
 dnl Check for tputs() callback argument
 NMH_TPUTS_PUTC_ARG
 

-termcap_curses_order="termcap curses ncurses"
+termcap_curses_order="termcap tinfo curses ncurses"

 for lib in $termcap_curses_order; do
   AC_CHECK_LIB([${lib}], [setupterm], [TERMLIB="-l$lib"; break])
 done
 for lib in $termcap_curses_order; do
   AC_CHECK_LIB([${lib}], [setupterm], [TERMLIB="-l$lib"; break])
 done


@@ -573,6 +558,20 @@ AS_IF([test "$LEX" = flex],
                 s/int n; \\/yy_size_t n; \\/'\'' $@ >$@.tmp && mv -f $@.tmp $@;'])
        AC_SUBST([AM_LFLAGS])])
 
                 s/int n; \\/yy_size_t n; \\/'\'' $@ >$@.tmp && mv -f $@.tmp $@;'])
        AC_SUBST([AM_LFLAGS])])
 

+dnl ------------------
+dnl By default we put backend executables in $(libexecdir)/nmh and
+dnl configuration files in $(sysconfdir)/nmh, but let a user override
+dnl these choices by supplying these variables
+dnl ------------------
+
+AC_ARG_VAR([nmhlibexecdir], [The installation directory for backend programs
+used by nmh.  Defaults to $(libexecdir)/nmh.])
+AS_IF([test -z ${nmhlibexecdir+x}], [nmhlibexecdir='${libexecdir}/nmh'])
+
+AC_ARG_VAR([nmhetcdir], [The installation directory for configuration files
+used by nmh.  Defaults to $(sysconfdir)/nmh.])
+AS_IF([test -z ${nmhetcdir+x}], [nmhetcdir='${sysconfdir}/nmh'])
+

 dnl ------------------
 dnl FOR INTERNAL USE by the NMH test suite
 dnl ------------------
 dnl ------------------
 dnl FOR INTERNAL USE by the NMH test suite
 dnl ------------------


@@ -604,7 +603,7 @@ dnl exist.
 dnl
 
 AC_CONFIG_COMMANDS([build-directories],
 dnl
 
 AC_CONFIG_COMMANDS([build-directories],

-[test -d man || AS_MKDIR_P([man])])
+[AS_MKDIR_P([etc]); AS_MKDIR_P([man])])

 
 AC_CONFIG_COMMANDS_POST([
 
 
 AC_CONFIG_COMMANDS_POST([
 


@@ -616,8 +615,9 @@ dnl We only use the expanded versions to print the install paths in
 dnl the final summary and should use them nowhere else (see the autoconf
 dnl docs for the rationale for bindir etc being unexpanded).
 eval "nmhbin=${bindir}";         eval "nmhbin=${nmhbin}"
 dnl the final summary and should use them nowhere else (see the autoconf
 dnl docs for the rationale for bindir etc being unexpanded).
 eval "nmhbin=${bindir}";         eval "nmhbin=${nmhbin}"

-eval "nmhlibexec=${libexecdir}"; eval "nmhlibexec=${nmhlibexec}"
-eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf=${nmhsysconf}"
+eval "nmhlibexec=${nmhlibexecdir}"; eval "nmhlibexec=${nmhlibexec}"
+eval "nmhlibexec=${nmhlibexec}"
+eval "nmhsysconf=${nmhetcdir}"; eval "nmhsysconf=${nmhsysconf}"

 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 eval "nmhdoc=${docdir}";         eval "nmhdoc=${nmhdoc}"
 eval "nmhrpm=${nmhrpm}";
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 eval "nmhdoc=${docdir}";         eval "nmhdoc=${nmhdoc}"
 eval "nmhrpm=${nmhrpm}";


@@ -633,8 +633,8 @@ linker flags               : ${AM_LDFLAGS} ${LDFLAGS}
 preprocessor flags         : ${AM_CPPFLAGS} ${CPPFLAGS}
 source code location       : ${srcdir}
 binary install path        : ${nmhbin}
 preprocessor flags         : ${AM_CPPFLAGS} ${CPPFLAGS}
 source code location       : ${srcdir}
 binary install path        : ${nmhbin}

-libexec install path       : ${nmhlibexec}/nmh
-config files install path  : ${nmhsysconf}/nmh
+libexec install path       : ${nmhlibexec}
+config files install path  : ${nmhsysconf}

 man page install path      : ${nmhman}
 docs install path          : ${nmhdoc}
 RPM build root             : ${nmhrpm}
 man page install path      : ${nmhman}
 docs install path          : ${nmhdoc}
 RPM build root             : ${nmhrpm}