From 58a64d8294c264422ec2c13f51d9776cb9cbf469 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 6 Mar 2010 17:07:50 +0200 Subject: Enable silent rules. * configure.ac: Require autoconf 2.63, automake 1.11.1 Enable silent rules by default. * Makefile.am: Add AM_V_GEN where necessary. * src/Makefile.am (EXTRA_DIST): Add mysql.c, pgsql.c Add AM_V_GEN where necessary. * am/guile.m4: fix help string. --- Makefile.am | 2 +- am/guile.m4 | 4 ++-- configure.ac | 53 +++++++++++++++++++++++++++++------------------------ src/Makefile.am | 14 +++++++------- 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/Makefile.am b/Makefile.am index aba7c27..e8c4ffb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ changelog_dir = . .PHONY: ChangeLog ChangeLog: - if test -d .git; then \ + $(AM_V_GEN)if test -d .git; then \ cmd=$(top_srcdir)/scripts/gitlog-to-changelog; \ if test -n "$(gen_start_date)"; then \ cmd="$$cmd --since=\"$(gen_start_date)\""; \ diff --git a/am/guile.m4 b/am/guile.m4 index 33fcbff..6c2faf5 100644 --- a/am/guile.m4 +++ b/am/guile.m4 @@ -1,5 +1,5 @@ dnl This file is part of GNU mailutils. -dnl Copyright (C) 2001, 2004, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2001, 2004, 2007, 2010 Free Software Foundation, Inc. dnl dnl This program is free software; you can redistribute it and/or modify it dnl under the terms of the GNU General Public License as published by the @@ -82,7 +82,7 @@ AC_DEFUN([MU_CHECK_GUILE], if test $mu_cv_lib_guile = yes; then AC_ARG_WITH([guiledir], AC_HELP_STRING([--with-guiledir=DIR], - [Specify the directory to install guile modules to]), + [specify directory to install guile modules to]), [case $withval in /*) GUILE_SITE=$withval;; yes) GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`/site;; diff --git a/configure.ac b/configure.ac index e34de72..444cc1a 100644 --- a/configure.ac +++ b/configure.ac @@ -14,16 +14,19 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with Gamma. If not, see . -AC_PREREQ(2.59) +AC_PREREQ(2.63) AC_INIT(gamma, 1.99, [gray@gnu.org.ua]) AC_CONFIG_SRCDIR(src/guile-sql.h) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([gnu 1.8]) +AM_INIT_AUTOMAKE([1.11.1 gnu tar-ustar silent-rules]) AC_CONFIG_HEADERS([config.h]) +# Enable silent rules by default: +AM_SILENT_RULES([yes]) + dnl Checks for programs. AC_PROG_AWK AC_PROG_CC @@ -34,23 +37,23 @@ AM_C_PROTOTYPES AC_SUBST(INCLUDEPATH) AC_MSG_CHECKING(for additional includes) -AC_ARG_WITH(include-path, - [ --with-include-path=PATH specify additional include paths. - PATH is a ':' separated list of additional - include paths. ], - [ for path in `echo $withval | sed 's/:/ /g'` - do - INCLUDEPATH="$INCLUDEPATH -I$path" - done]) +AC_ARG_WITH([include-path], + AC_HELP_STRING([--with-include-path=PATH], + [specify additional include paths; PATH is a ':' separated list of directories]), + [ for path in `echo $withval | sed 's/:/ /g'` + do + INCLUDEPATH="$INCLUDEPATH -I$path" + done]) AC_MSG_RESULT($INCLUDEPATH) AC_MSG_CHECKING(for additional libraries) -AC_ARG_WITH(lib-path, - [ --with-lib-path=PATH specify additional library paths.], - [ for path in `echo $withval | sed 's/:/ /g'` - do - LIBS="$LIBS -L$path" - done]) +AC_ARG_WITH([lib-path], + AC_HELP_STRING([--with-lib-path=PATH], + [specify additional library paths]), + [ for path in `echo $withval | sed 's/:/ /g'` + do + LIBS="$LIBS -L$path" + done]) AC_MSG_RESULT($LIBS) dnl Checks for libraries. @@ -63,12 +66,14 @@ if test $mu_cv_lib_guile = yes; then MYSQL=yes PGSQL=yes - AC_ARG_WITH(mysql, - [ --without-mysql Configure to work without MySQL], - [MYSQL=$withval]) - AC_ARG_WITH(postgres, - [ --without-postgres Configure to work without Postgres], - [PGSQL=$withval]) + AC_ARG_WITH([mysql], + AC_HELP_STRING([--without-mysql], + [configure to work without MySQL]), + [MYSQL=$withval]) + AC_ARG_WITH([postgres], + AC_HELP_STRING([--without-postgres], + [configure to work without Postgres]), + [PGSQL=$withval]) SQLLIBS="" # Check individual libraries @@ -98,10 +103,10 @@ if test $mu_cv_lib_guile = yes; then INSTALL_HOOKS="$INSTALL_HOOKS install-sql-hook" if test $MYSQL = yes ; then - AC_LIBOBJ(mysql) + AC_LIBOBJ([mysql]) fi if test $PGSQL = yes ; then - AC_LIBOBJ(pgsql) + AC_LIBOBJ([pgsql]) fi fi fi diff --git a/src/Makefile.am b/src/Makefile.am index 46633c1..92894eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,11 +29,11 @@ libgamma_sql_la_SOURCES=\ libgamma_sql_la_LDFLAGS = -rpath $(libdir) -version-info 0:0:0 noinst_HEADERS=guile-sql.h app.h -EXTRA_DIST=sql.sci +EXTRA_DIST=sql.sci mysql.c pgsql.c .sci.scm: - m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \ - -DBUILDDIR="`pwd`" $< > $@ + $(AM_V_GEN)m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \ + -DBUILDDIR="`pwd`" $< > $@ sql.scm: Makefile $(libgamma_sql_la_SOURCES:.c=.inc) @@ -58,20 +58,20 @@ GUILE_DOC_SNARF=$(top_srcdir)/scripts/guile-doc-snarf SUFFIXES=.x .doc .inc .sci .scm .c.x: - AWK=$(AWK) \ + $(AM_V_GEN)AWK=$(AWK) \ $(GUILE_DOC_SNARF) -o $@ \ $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) .c.doc: - AWK=$(AWK) \ + $(AM_V_GEN)AWK=$(AWK) \ $(GUILE_DOC_SNARF) -d -o $@ \ $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) .c.inc: - sed -n 's/SCM_DEFINE *(.[^,]*, *\"\([^"][^"]*\)\".*/[(export \1)]/p' $< > $@ + $(AM_V_GEN)sed -n 's/SCM_DEFINE *(.[^,]*, *\"\([^"][^"]*\)\".*/[(export \1)]/p' $< > $@ guile-procedures.txt: $(DOT_DOC_FILES) - cat $(DOT_DOC_FILES) > $@ + $(AM_V_GEN)cat $(DOT_DOC_FILES) > $@ ## Add -MG to make the .x magic work with auto-dep code. MKDEP = $(CC) -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -- cgit v1.2.1