[vlc-devel] commit: Remove un-needed VLC_CONFIG_HELPER macro ( Rémi Denis-Courmont )
git version control
git at videolan.org
Mon Apr 21 22:05:07 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon Apr 21 23:01:06 2008 +0300| [e4a0fb28f3758b47c5c3b9d94b0ece847672cc3b]
Remove un-needed VLC_CONFIG_HELPER macro
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e4a0fb28f3758b47c5c3b9d94b0ece847672cc3b
---
bootstrap | 15 +--------------
m4/vlc.m4 | 2 --
2 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/bootstrap b/bootstrap
index f6e67db..9392f0b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -80,7 +80,7 @@ fi
##
set +x
-echo "generating modules/**/Makefile.am and m4/private.m4"
+echo "generating modules/**/Makefile.am"
# Prepare m4/private.m4
rm -f m4/private.m4 && cat > m4/private.m4 << EOF
@@ -95,21 +95,8 @@ AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
EOF
fi
-cat >> m4/private.m4 << EOF
-dnl Helper macro for vlc-config generation
-AC_DEFUN([VLC_CONFIG_HELPER], [
- cat >> vlc-config.in << BLAH
-EOF
-
-modules=""
-
modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
-cat >> m4/private.m4 << EOF
-BLAH
-])
-EOF
-
###
### classic bootstrap stuff
###
diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 93ee4ec..7ba36d8 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -138,8 +138,6 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
sed -ne '/#@1@#/,/#@2@#/p' < "${srcdir}/vlc-config.in.in" \
| sed -e '/#@.@#/d' >> vlc-config.in
- VLC_CONFIG_HELPER
-
dnl '/#@2@#/,${/#@.@#/d;p}' won't work on OS X
sed -ne '/#@2@#/,$p' < "${srcdir}/vlc-config.in.in" \
| sed -e '/#@.@#/d' >> vlc-config.in
More information about the vlc-devel
mailing list