diff options
-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 @@ -14,7 +14,26 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -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 distuninstallcheck_listfiles = find . -type f -not -name 'mailfromd.rc' -print @@ -51,7 +70,7 @@ ChangeLog: if test -n "$(gen_start_date)"; then \ cmd="$$cmd --since=\"$(gen_start_date)\""; \ fi; \ - $$cmd | \ + $$cmd --format='%s%n%n%b%n' | \ sed '/<unknown>$$/d' | fmt -s > $(changelog_dir)/cl-t; \ if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \ then \ @@ -82,12 +82,12 @@ before returning to the caller. * `Open' function 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.: number fd open("@ inet://127.0.0.1:25") -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. * New I/O functions diff --git a/configure.ac b/configure.ac index e93cdbe9..aaf298b4 100644 --- a/configure.ac +++ b/configure.ac @@ -602,12 +602,13 @@ if test "$enable_pmilter" = yes; then #include "sm/pmfdef.h" #include "sm/pmfapi.h"]) - AC_SUBST(ENABLE_PMULT,'${PMULT_PROG}') LIBS="$LIBS $META1_LIBS" AC_CHECK_FUNCS([sm_pmfi_setmacs]) LIBS=$saved_LIBS fi +AM_CONDITIONAL([PMULT_COND], [test "$enable_pmilter" = yes]) + # GeoIP AC_ARG_WITH([geoip], AC_HELP_STRING([--with-geoip], diff --git a/pmult/Makefile.am b/pmult/Makefile.am index 33860c6a..40acd323 100644 --- a/pmult/Makefile.am +++ b/pmult/Makefile.am @@ -14,9 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -PMULT_PROG = pmult -sbin_PROGRAMS = @ENABLE_PMULT@ -EXTRA_PROGRAMS = pmult +sbin_PROGRAMS = pmult EXTRA_DIST = pdbg.hm4 debugdef.m4 BUILT_SOURCES = pdbg.h |