diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-06 17:07:50 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-03-06 17:07:50 +0200 |
commit | 58a64d8294c264422ec2c13f51d9776cb9cbf469 (patch) | |
tree | d38f7ac9413d87d53a93345fd7749995adf7163c | |
parent | 3e26e4fdb0e87eb89055c150d5089b5f2b7f10e6 (diff) | |
download | gamma-58a64d8294c264422ec2c13f51d9776cb9cbf469.tar.gz gamma-58a64d8294c264422ec2c13f51d9776cb9cbf469.tar.bz2 |
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.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | am/guile.m4 | 4 | ||||
-rw-r--r-- | configure.ac | 53 | ||||
-rw-r--r-- | 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 @@ -25,13 +25,13 @@ SUBDIRS = src scripts examples gen_start_date = 2008-06-21 prev_change_log = ChangeLog.cvs 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)\""; \ fi; \ $$cmd --format='%s%n%n%b%n' | \ sed '/<unknown>$$/d' | fmt -s > $(changelog_dir)/cl-t; \ diff --git a/am/guile.m4 b/am/guile.m4 index 33fcbff..6c2faf5 100644 --- a/am/guile.m4 +++ b/am/guile.m4 @@ -1,8 +1,8 @@ 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 dnl Free Software Foundation; either version 3 of the License, or (at your dnl option) any later version. dnl @@ -79,13 +79,13 @@ AC_DEFUN([MU_CHECK_GUILE], MU_RESULT_ACTIONS([mu_cv_lib_guile],[LIBGUILE],[$2],[$3]) AC_MSG_RESULT(${cached}$mu_cv_lib_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;; *) AC_MSG_ERROR([Argument to --with-guiledir must be an absolute directory name]);; esac], [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 @@ -11,67 +11,72 @@ dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. dnl dnl You should have received a copy of the GNU General Public License dnl along with Gamma. If not, see <http://www.gnu.org/licenses/>. -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 AC_PROG_INSTALL AC_PROG_LN_S AM_PROG_LIBTOOL 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. MU_CHECK_GUILE dnl Checks for library functions. AC_HEADER_STDC 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 RA_CHECK_LIB(mysqlclient, mysql_real_connect, "-lm", [ AC_DEFINE(USE_SQL_MYSQL,1, [Define this if you are going to use MySQL]) @@ -95,16 +100,16 @@ if test $mu_cv_lib_guile = yes; then BUILD_LIBS="$BUILD_LIBS \$(LIB_SQL)" BUILD_DATA="$BUILD_DATA \$(SCM_SQL)" BUILD_X="$BUILD_X \$(X_SQL)" 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 if test x"$BUILD_LIBS" = x; then AC_MSG_ERROR([Nothing to build!]) diff --git a/src/Makefile.am b/src/Makefile.am index 46633c1..92894eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,17 +26,17 @@ libgamma_sql_la_SOURCES=\ gsql_conn.c\ gsql_lib.c 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) SCM_SQL=sql.scm X_SQL=gsql_conn.x @@ -55,26 +55,26 @@ ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_L --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/' 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) install-sql-hook: @here=`pwd` |