From: Rémi Denis-Courmont <rem@videolan.org>
Date: Mon, 21 Apr 2008 20:01:06 +0000 (+0300)
Subject: Remove un-needed VLC_CONFIG_HELPER macro
X-Git-Tag: 0.9.0-test0~1375
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e4a0fb28f3758b47c5c3b9d94b0ece847672cc3b;p=vlc

Remove un-needed VLC_CONFIG_HELPER macro
---

diff --git a/bootstrap b/bootstrap
index f6e67db5e3..9392f0bcca 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 93ee4ec3c9..7ba36d8529 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