diff options
author | Adrian Bunk <bunk@stusta.de> | 2012-04-07 19:39:39 +0300 |
---|---|---|
committer | Felipe Contreras <felipe.contreras@gmail.com> | 2012-06-06 13:33:27 +0200 |
commit | aaa0a1b9098f3db523ce62a671d7573721274697 (patch) | |
tree | 43a522a06a7a6272ff1e1d0333bed9a43f093c13 | |
parent | 9a0e56b19232402b0ce34d727371c32120d83ae8 (diff) |
remove obsolete shave remainders
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
-rw-r--r-- | .gitignore | 2 | ||||
-rwxr-xr-x | build-aux/update-common | 3 | ||||
-rw-r--r-- | m4/shave.m4 | 76 |
3 files changed, 0 insertions, 81 deletions
@@ -17,8 +17,6 @@ configure libtool stamp-h1 stamp-h.in -shave -shave-libtool build-aux/compile build-aux/depcomp diff --git a/build-aux/update-common b/build-aux/update-common index 015c9b1..77a0ddd 100755 --- a/build-aux/update-common +++ b/build-aux/update-common @@ -14,6 +14,3 @@ cp $orig/m4/gst-check.m4 m4/gst-check.m4 cp $orig/m4/gst-error.m4 m4/gst-error.m4 cp $orig/m4/gst-plugindir.m4 m4/gst-plugindir.m4 cp $orig/m4/gst.m4 m4/gst.m4 -cp $orig/m4/shave.m4 m4/shave.m4 -cp $orig/shave-libtool.in shave-libtool.in -cp $orig/shave.in shave.in diff --git a/m4/shave.m4 b/m4/shave.m4 deleted file mode 100644 index 01cb5c7..0000000 --- a/m4/shave.m4 +++ /dev/null @@ -1,76 +0,0 @@ -dnl Make automake/libtool output more friendly to humans -dnl -dnl SHAVE_INIT([shavedir],[default_mode]) -dnl -dnl shavedir: the directory where the shave scripts are, it defaults to -dnl $(top_builddir) -dnl default_mode: (enable|disable) default shave mode. This parameter -dnl controls shave's behaviour when no option has been -dnl given to configure. It defaults to disable. -dnl -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and -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_ARG_ENABLE], -[ - AC_ARG_ENABLE([shave], - AS_HELP_STRING( - [--enable-shave], - [use shave to make the build pretty [[default=$1]]]),, - [enable_shave=$1] - ) -]) - -AC_DEFUN([SHAVE_INIT], -[ - dnl you can tweak the default value of enable_shave - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) - - if test x"$enable_shave" = xyes; then - dnl where can we find the shave scripts? - m4_if([$1],, - [shavedir="$ac_pwd"], - [shavedir="$ac_pwd/$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 - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" - AC_SUBST(LIBTOOL) - - dnl substitute cc/cxx - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - SHAVE_SAVED_OBJC=$OBJC - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" - OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" - AC_SUBST(CC) - AC_SUBST(CXX) - AC_SUBST(FC) - AC_SUBST(F77) - AC_SUBST(OBJC) - - V=@ - else - V=1 - fi - Q='$(V:1=)' - AC_SUBST(V) - AC_SUBST(Q) -]) - |