diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-18 01:00:01 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-18 01:00:01 +0300 |
commit | 50d90aca70a5f3033b9dbc4235bc11ec92a026d5 (patch) | |
tree | c0c4676fa32fb19f46f987a23e6667ee192b708c | |
parent | 5be37dcba1950fe6d917c18c9bd1983cb0f17185 (diff) | |
download | mailfromd-50d90aca70a5f3033b9dbc4235bc11ec92a026d5.tar.gz mailfromd-50d90aca70a5f3033b9dbc4235bc11ec92a026d5.tar.bz2 |
Improve conditional building of pmult.
* configure.ac (PMULT_COND): New condition
(ENABLE_PMULT): Rename subst variable.
* pmult/Makefile.am: Remove subst variable.
* Makefile.am (SUBDIRS): Include pmult conditionally
(ChangeLog rule): Improve formatting.
* NEWS: Improve wording.
-rw-r--r-- | Makefile.am | 23 | ||||
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | pmult/Makefile.am | 4 |
4 files changed, 26 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 15be2b85..1cff37f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,3 +16,22 @@ -SUBDIRS = gnu lib gacopyz mfd mflib mtasim smap pmult pies elisp po etc doc tests +if PMULT_COND + PMULT_DIR = pmult +endif + +SUBDIRS = \ + gnu\ + lib\ + gacopyz\ + mfd\ + mflib\ + mtasim\ + smap\ + $(PMULT_DIR)\ + pies\ + elisp\ + po\ + etc\ + doc\ + tests + ACLOCAL_AMFLAGS = -I m4 -I am @@ -53,3 +72,3 @@ ChangeLog: fi; \ - $$cmd | \ + $$cmd --format='%s%n%n%b%n' | \ sed '/<unknown>$$/d' | fmt -s > $(changelog_dir)/cl-t; \ @@ -84,3 +84,3 @@ before returning to the caller. The `open' function can be used to connect to TCP/IP sockets. To -do so, its first argument must be a valid socket URL prefixes with +do so, its first argument must be a valid socket URL prefixed with `@'. E.g.: @@ -89,3 +89,3 @@ do so, its first argument must be a valid socket URL prefixes with -The I/O operations on `fd' will write and read from the opened socket. +The I/O operations on `fd' will write to and read from the opened socket. diff --git a/configure.ac b/configure.ac index e93cdbe9..aaf298b4 100644 --- a/configure.ac +++ b/configure.ac @@ -604,3 +604,2 @@ if test "$enable_pmilter" = yes; then - AC_SUBST(ENABLE_PMULT,'${PMULT_PROG}') LIBS="$LIBS $META1_LIBS" @@ -610,2 +609,4 @@ fi +AM_CONDITIONAL([PMULT_COND], [test "$enable_pmilter" = yes]) + # GeoIP diff --git a/pmult/Makefile.am b/pmult/Makefile.am index 33860c6a..40acd323 100644 --- a/pmult/Makefile.am +++ b/pmult/Makefile.am @@ -16,5 +16,3 @@ -PMULT_PROG = pmult -sbin_PROGRAMS = @ENABLE_PMULT@ -EXTRA_PROGRAMS = pmult +sbin_PROGRAMS = pmult EXTRA_DIST = pdbg.hm4 debugdef.m4 |