projects
/
mmh
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d6bc0d1
)
Still more autoconf cleanup (quoting & more use of M4sh).
author
Ken Hornstein
<kenh@pobox.com>
Mon, 6 Feb 2012 19:12:00 +0000
(14:12 -0500)
committer
Ken Hornstein
<kenh@pobox.com>
Mon, 6 Feb 2012 19:12:00 +0000
(14:12 -0500)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
10da4b3
..
fd91d36
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-12,12
+12,12
@@
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
AC_CANONICAL_HOST
AC_CANONICAL_HOST
-echo "configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION"
+AC_MSG_NOTICE([configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION])
AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl
dnl What date of nmh are we building?
DATE=`cat ${srcdir}/DATE`
AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl
dnl What date of nmh are we building?
DATE=`cat ${srcdir}/DATE`
-echo "configuring for nmh dated $DATE"
+AC_MSG_NOTICE([configuring for nmh dated $DATE])
AC_SUBST([DATE])dnl
dnl --------------------------
AC_SUBST([DATE])dnl
dnl --------------------------
@@
-75,11
+75,8
@@
AS_IF([test -n "$with_editor"], [editorpath="$with_editor"])
dnl Set the backup prefix
AC_ARG_WITH([hash-backup],
AS_HELP_STRING([--with-hash-backup],[use # as the backup prefix (default: ,)]))
dnl Set the backup prefix
AC_ARG_WITH([hash-backup],
AS_HELP_STRING([--with-hash-backup],[use # as the backup prefix (default: ,)]))
-if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
- backup_prefix="#"
-else
- backup_prefix=","
-fi
+AS_IF([test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"],
+ [backup_prefix="#"], [backup_prefix=","])
AC_DEFINE_UNQUOTED([BACKUP_PREFIX], "$backup_prefix",
[The prefix that is prepended to the name of message files when they are "removed" by rmm. This should typically be `,' or `#'.])dnl
AC_DEFINE_UNQUOTED([BACKUP_PREFIX], "$backup_prefix",
[The prefix that is prepended to the name of message files when they are "removed" by rmm. This should typically be `,' or `#'.])dnl
@@
-134,9
+131,7
@@
dnl What should be the default pager?
AC_ARG_WITH([pager],
AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
AC_ARG_WITH([pager],
AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
-if test -n "$with_pager"; then
- pagerpath="$with_pager"
-fi
+AS_IF([test -n "$with_pager"], [pagerpath="$with_pager"])
dnl What should be the default mail server(s)?
AC_ARG_WITH(smtpservers,
dnl What should be the default mail server(s)?
AC_ARG_WITH(smtpservers,
@@
-331,7
+326,7
@@
done
nmh_cv_mailspool=$mailspool
])
mailspool=$nmh_cv_mailspool
nmh_cv_mailspool=$mailspool
])
mailspool=$nmh_cv_mailspool
-AC_SUBST(mailspool)dnl
+AC_SUBST([mailspool])dnl
dnl See whether the mail spool directory is world-writable.
if test "$lspath" != "no" -a "$cutpath" != "no"; then
dnl See whether the mail spool directory is world-writable.
if test "$lspath" != "no" -a "$cutpath" != "no"; then
@@
-345,7
+340,7
@@
if test "$lspath" != "no" -a "$cutpath" != "no"; then
fi
dnl Also, check for liblockfile (as found on Debian systems)
fi
dnl Also, check for liblockfile (as found on Debian systems)
-AC_CHECK_HEADER([lockfile.h], AC_CHECK_LIB(lockfile, lockfile_create) )
+AC_CHECK_HEADER([lockfile.h], [AC_CHECK_LIB(lockfile, lockfile_create)])
dnl and whether its companion program dotlockfile is setgid
AC_PATH_PROG(dotlockfilepath, dotlockfile, no)
dnl and whether its companion program dotlockfile is setgid
AC_PATH_PROG(dotlockfilepath, dotlockfile, no)
@@
-391,20
+386,18
@@
dnl because it must be set before any system header is included and there's no
dnl portable way to make sure that files generated by lex include config.h
dnl before system header files.
dnl portable way to make sure that files generated by lex include config.h
dnl before system header files.
-case "$host_os" in
- linux*)
- # Like DEFS, but doesn't get stomped on by configure when using config.h:
+AS_CASE(["$host_os"],
+ [linux*],
+ [# Like DEFS, but doesn't get stomped on by configure when using config.h:
test -z "$OURDEFS" && OURDEFS="-D_GNU_SOURCE" \
test -z "$OURDEFS" && OURDEFS="-D_GNU_SOURCE" \
- || OURDEFS="$OURDEFS -D_GNU_SOURCE"
- ;;
-esac
+ || OURDEFS="$OURDEFS -D_GNU_SOURCE"])
AC_SUBST(OURDEFS)
AC_HEADER_STDC
AC_HEADER_TIOCGWINSZ
AC_SUBST(OURDEFS)
AC_HEADER_STDC
AC_HEADER_TIOCGWINSZ
-AC_CHECK_HEADERS(errno.h fcntl.h crypt.h ncurses/termcap.h termcap.h \
- langinfo.h wchar.h wctype.h iconv.h netdb.h \
- sys/param.h sys/time.h sys/stream.h)
+AC_CHECK_HEADERS([errno.h fcntl.h crypt.h ncurses/termcap.h termcap.h \
+ langinfo.h wchar.h wctype.h iconv.h netdb.h \
+ sys/param.h sys/time.h sys/stream.h])
dnl
dnl Checks for _IO_write_ptr. A Linuxism used by nmh on linux. We
dnl
dnl Checks for _IO_write_ptr. A Linuxism used by nmh on linux. We
@@
-425,7
+418,7
@@
AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
dnl ---------------
dnl CHECK FUNCTIONS
dnl ---------------
dnl ---------------
dnl CHECK FUNCTIONS
dnl ---------------
-AC_CHECK_FUNCS(writev lstat nl_langinfo)
+AC_CHECK_FUNCS([writev lstat nl_langinfo])
dnl Check for multibyte character set support
if test "x$ac_cv_header_wchar_h" = "xyes" -a "x$ac_cv_header_wctype_h" = "xyes" \
dnl Check for multibyte character set support
if test "x$ac_cv_header_wchar_h" = "xyes" -a "x$ac_cv_header_wctype_h" = "xyes" \
@@
-727,7
+720,7
@@
test -d man || ${MKDIR_P} man])
AC_CONFIG_COMMANDS_POST([
dnl These odd looking assignments are done to expand out unexpanded
AC_CONFIG_COMMANDS_POST([
dnl These odd looking assignments are done to expand out unexpanded
-dnl variables in bindir et al (for instance mandir is '${datarootdir}/man',
+dnl variables in bindir et al (for instance mandir is '${datarootdir}/man'),
dnl but expanding that gives '${prefix}/share/man', so we need to expand
dnl again to get the final answer.
dnl We only use the expanded versions to print the install paths in
dnl but expanding that gives '${prefix}/share/man', so we need to expand
dnl again to get the final answer.
dnl We only use the expanded versions to print the install paths in
@@
-739,7
+732,7
@@
eval "nmhlib=${libdir}"; eval "nmhlib=${nmhlib}"
eval "nmhman=${mandir}"; eval "nmhman=${nmhman}"
eval "nmhrpm=${nmhrpm}";
eval "nmhman=${mandir}"; eval "nmhman=${nmhman}"
eval "nmhrpm=${nmhrpm}";
-echo "
+AC_MSG_NOTICE([
nmh configuration
-----------------
nmh version : AC_PACKAGE_VERSION
nmh configuration
-----------------
nmh version : AC_PACKAGE_VERSION
@@
-762,8
+755,8
@@
default editor : ${editorpath}
default pager : ${pagerpath}
email address masquerading : ${masquerade}
SASL support : ${sasl_support}
default pager : ${pagerpath}
email address masquerading : ${masquerade}
SASL support : ${sasl_support}
-TLS support : ${tls_support}"
-echo ""])
+TLS support : ${tls_support}
+])])dnl
dnl ---------------
dnl OUTPUT MAKEFILE
dnl ---------------
dnl OUTPUT MAKEFILE