mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-15 08:56:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

run make update-shave

Browse source
This commit is contained in:
Lennart Poettering 2009-03-02 14:28:43 +01:00
parent ea1d429c3b
commit 4e86a4c759
3 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
m4/shave.m4
View file

@ -1,9 +1,12 @@
dnl Make automake/libtool output more friendly to humans dnl Make automake/libtool output more friendly to humans
dnl dnl
dnl SHAVE_INIT([shavedir]) dnl SHAVE_INIT([shavedir],[default_mode])
dnl dnl
dnl shavedir: the directory where the shave scripts are, it defaults to dnl shavedir: the directory where the shave scripts are, it defaults to
dnl $(top_builddir) 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
dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just 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 before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and
@ -11,19 +14,26 @@ dnl LIBTOOL, you don't want the configure tests to have these variables
dnl re-defined. dnl re-defined.
dnl * This macro requires GNU make's -s option. 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], AC_DEFUN([SHAVE_INIT],
[ [
dnl enable/disable shave dnl you can tweak the default value of enable_shave
AC_ARG_ENABLE([shave], m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
AS_HELP_STRING([--enable-shave],
[use shave to make the build pretty [[default=no]]]),,
[enable_shave=no])
if test x"$enable_shave" = xyes; then if test x"$enable_shave" = xyes; then
dnl where can we find the shave scripts? dnl where can we find the shave scripts?
m4_if([$1],, m4_if([$1],,
[shavedir='$(top_builddir)'], [shavedir="$ac_pwd"],
[shavedir='$(top_builddir)'/$1]) [shavedir="$ac_pwd/$1"])
AC_SUBST(shavedir) AC_SUBST(shavedir)
dnl make is now quiet dnl make is now quiet
@ -35,19 +45,22 @@ AC_DEFUN([SHAVE_INIT],
dnl substitute libtool dnl substitute libtool
SHAVE_SAVED_LIBTOOL=$LIBTOOL SHAVE_SAVED_LIBTOOL=$LIBTOOL
AC_SUBST(SHAVE_SAVED_LIBTOOL) LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
LIBTOOL="\$(SHELL) \$(shavedir)/shave-libtool '\$(SHAVE_SAVED_LIBTOOL)'"
AC_SUBST(LIBTOOL) AC_SUBST(LIBTOOL)
dnl substitute cc/cxx dnl substitute cc/cxx
SHAVE_SAVED_CC=$CC SHAVE_SAVED_CC=$CC
SHAVE_SAVED_CXX=$CXX SHAVE_SAVED_CXX=$CXX
AC_SUBST(SHAVE_SAVED_CC) SHAVE_SAVED_FC=$FC
AC_SUBST(SHAVE_SAVED_CXX) SHAVE_SAVED_F77=$F77
CC="\$(SHELL) \$(shavedir)/shave cc '\$(SHAVE_SAVED_CC)'" CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
CXX="\$(SHELL) \$(shavedir)/shave cxx '\$(SHAVE_SAVED_CXX)'" CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
AC_SUBST(CC) AC_SUBST(CC)
AC_SUBST(CXX) AC_SUBST(CXX)
AC_SUBST(FC)
AC_SUBST(F77)
V=@ V=@
else else
@ -58,12 +71,3 @@ AC_DEFUN([SHAVE_INIT],
AC_SUBST(Q) AC_SUBST(Q)
]) ])
AC_DEFUN([SHAVE_OUTPUT],
[
if test x"$enable_shave" = xyes; then
dnl small workaround to fix libtool itself
dnl it's shokingly hard to find a better way, really! wtf...
test -f $srcdir/libtool && (tmpfile=`mktemp` && cat $srcdir/libtool | sed "s,^LTCC=.*$,LTCC=\"$SHELL $ac_pwd/shave cc $SHAVE_SAVED_CC\"," > $tmpfile && mv $tmpfile $srcdir/libtool)
fi
])

2
shave-libtool.in
View file

@ -8,7 +8,7 @@ fi
lt_unmangle () lt_unmangle ()
{ {
last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_]\*_la-##'` last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
} }
# the real libtool to use # the real libtool to use

8
shave.in
View file

@ -8,7 +8,7 @@ fi
lt_unmangle () lt_unmangle ()
{ {
last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_]\*_la-##'` last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
} }
# the tool to wrap (cc, cxx, ar, ranlib, ..) # the tool to wrap (cc, cxx, ar, ranlib, ..)
@ -50,6 +50,12 @@ link,*)
*,cc) *,cc)
Q=" CC " Q=" CC "
;; ;;
*,fc)
Q=" FC "
;;
*,f77)
Q=" F77 "
;;
*,*) *,*)
# should not happen # should not happen
Q=" CC " Q=" CC "