From c92a5bbed59062fe06cc337b4ff256456983bf95 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Fri, 12 Jun 2009 16:44:32 +0300 Subject: [PATCH] Initial configuration changes. * configure.ac: Define MTA_GREETING Update version number. * statethreads/Makefile.am (ASCOMPILE): Use CCAS, not AS. --- configure.ac | 7 ++++++- statethreads/Makefile.am | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cb9231b..b3e460e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ mta_TYPE, [Gamma], [3], [4] )) AC_INIT(mta, -[mta_MAJOR.mta_MINOR.mta_TYPE[]mta_TYPEVERSION.mta_LEVEL], +[mta_MAJOR.mta_MINOR.mta_TYPE[]mta_TYPEVERSION.mta_LEVEL]-gray-1, [bugs (at) MeTA1.org]) AC_PREREQ(2.52) AC_COPYRIGHT([Copyright (c) 2007-2009 Claus Assmann]) @@ -457,6 +457,11 @@ SM_SHA AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) +AC_ARG_VAR([MTA_GREETING],[MTA greeting banner]) +if test -n "$MTA_GREETING"; then + AC_DEFINE_UNQUOTED([MTA_GREETING], "$MTA_GREETING", [MTA greeting banner]) +fi + dnl The use of `AC_OUTPUT' with argument is deprecated, this obsoleted dnl interface is equivalent to: dnl AC_CONFIG_FILES(FILE...) diff --git a/statethreads/Makefile.am b/statethreads/Makefile.am index 3dc9ca4..43604cd 100644 --- a/statethreads/Makefile.am +++ b/statethreads/Makefile.am @@ -64,7 +64,8 @@ $(HEADER): public.h rm -f $@ cp $(srcdir)/public.h $@ -ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) +ASCOMPILE = $(CCAS) $(AM_ASFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) + .S.o: $(ASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .S.obj: -- 1.6.0.3