diff options
| author | Damien Lespiau <damien.lespiau@gmail.com> | 2009-02-23 00:08:41 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@gmail.com> | 2009-02-23 00:22:22 +0000 |
| commit | 8f68da694723bfa6c997de6241c967746b044883 (patch) | |
| tree | c1c09608f6ee84f4629d532aedc7d74509b648f4 | |
| parent | d91ba8b24377349116ea21ab449f1e40b3694502 (diff) | |
Add --enable-shave option and default to Good Old Behaviour
Signed-off-by: Damien Lespiau <damien.lespiau@gmail.com>
| -rw-r--r-- | shave/shave.m4 | 70 | ||||
| -rw-r--r-- | test/foo/Makefile.am | 6 |
2 files changed, 47 insertions, 29 deletions
diff --git a/shave/shave.m4 b/shave/shave.m4 index 80e797a..a49806b 100644 --- a/shave/shave.m4 +++ b/shave/shave.m4 @@ -11,30 +11,50 @@ dnl LIBTOOL, you don't want the configure tests to have these variables dnl re-defined. dnl * This macro requires GNU make's -s option. -AC_DEFUN([SHAVE_INIT], [ -dnl where can we find the shave scripts? -m4_if([$1],, - [shavedir='$(top_builddir)'], - [shavedir='$(top_builddir)'/$1]) -AC_SUBST(shavedir) -dnl make is now quiet -AC_SUBST([MAKEFLAGS], [-s]) -AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) -dnl we need sed -AC_CHECK_PROG(SED,sed,sed,false) -dnl substitute libtool -SHAVE_SAVED_LIBTOOL=$LIBTOOL -AC_SUBST(SHAVE_SAVED_LIBTOOL) -LIBTOOL="\$(SHELL) \$(shavedir)/shave-libtool '\$(SHAVE_SAVED_LIBTOOL)'" -AC_SUBST(LIBTOOL) -dnl substitute cc -SHAVE_SAVED_CC=$CC -SHAVE_SAVED_CXX=$CXX -AC_SUBST(SHAVE_SAVED_CC) -AC_SUBST(SHAVE_SAVED_CXX) -CC="\$(SHELL) \$(shavedir)/shave cc '\$(SHAVE_SAVED_CC)'" -CXX="\$(SHELL) \$(shavedir)/shave cxx '\$(SHAVE_SAVED_CXX)'" -AC_SUBST(CC) -AC_SUBST(CXX) +AC_DEFUN([SHAVE_INIT], +[ + dnl enable/disable shave + AC_ARG_ENABLE([shave], + AS_HELP_STRING([--enable-shave], + [use shave to make the build pretty [[default=no]]]),, + [enable_shave=no]) + + if test x"$enable_shave" = xyes; then + dnl where can we find the shave scripts? + m4_if([$1],, + [shavedir='$(top_builddir)'], + [shavedir='$(top_builddir)'/$1]) + AC_SUBST(shavedir) + + dnl make is now quiet + AC_SUBST([MAKEFLAGS], [-s]) + AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) + + dnl we need sed + AC_CHECK_PROG(SED,sed,sed,false) + + dnl substitute libtool + SHAVE_SAVED_LIBTOOL=$LIBTOOL + AC_SUBST(SHAVE_SAVED_LIBTOOL) + LIBTOOL="\$(SHELL) \$(shavedir)/shave-libtool '\$(SHAVE_SAVED_LIBTOOL)'" + AC_SUBST(LIBTOOL) + + dnl substitute cc/cxx + SHAVE_SAVED_CC=$CC + SHAVE_SAVED_CXX=$CXX + AC_SUBST(SHAVE_SAVED_CC) + AC_SUBST(SHAVE_SAVED_CXX) + CC="\$(SHELL) \$(shavedir)/shave cc '\$(SHAVE_SAVED_CC)'" + CXX="\$(SHELL) \$(shavedir)/shave cxx '\$(SHAVE_SAVED_CXX)'" + AC_SUBST(CC) + AC_SUBST(CXX) + + V=@ + else + V=1 + fi + Q='$(V:1=)' + AC_SUBST(V) + AC_SUBST(Q) ]) diff --git a/test/foo/Makefile.am b/test/foo/Makefile.am index 872de39..e3b9f2f 100644 --- a/test/foo/Makefile.am +++ b/test/foo/Makefile.am @@ -1,6 +1,4 @@ -V = @ -Q = $(V:1=) -QUIET_GEN = $(Q:@=@echo ' GEN '$@;) +SHAVE_GEN = $(Q:@=@echo ' GEN '$@;) lib_LTLIBRARIES = libfoo.la @@ -12,6 +10,6 @@ libfoo_la_LIBADD = internal/libinternal.la BUILT_SOURCES = lib-file2.h lib-file2.h: Makefile - $(QUIET_GEN)echo "#define FOO_DEFINE 0xbabe" > lib-file2.h + $(SHAVE_GEN)echo "#define FOO_DEFINE 0xbabe" > lib-file2.h CLEANFILES = lib-file2.h |