Remove some useless cruft

diff --git a/bootstrap b/bootstrap
index c29edb9984f690a410a3cf49c8d8d07d29a49a85..817f370329482f623bf7e8474c033a967f77ba8c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -169,21 +169,7 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 EOF
 fi
 
-rm -f m4/private.m4-tmp1 && cat > m4/private.m4-tmp1 << EOF
-dnl  The required AM_CONDITIONAL calls
-dnl  XXX: too many conditionals make the build very slow, disabled them
-AC_DEFUN([VLC_CONDITIONALS], [
-EOF
-rm -f m4/private.m4-tmp2 && cat > m4/private.m4-tmp2 << EOF
-dnl  The required AC_SUBST calls
-AC_DEFUN([VLC_SUBSTS], [
-EOF
-rm -f m4/private.m4-tmp3 && cat > m4/private.m4-tmp3 << EOF
-dnl  The required AC_OUTPUT calls
-dnl  XXX: this feature is only supported starting from automake-1.7
-AC_DEFUN([VLC_MAKEFILES], [AC_OUTPUT([
-EOF
-rm -f m4/private.m4-tmp4 && cat > m4/private.m4-tmp4 << EOF
+cat >> m4/private.m4 << EOF
 dnl  Helper macro for vlc-config generation
 AC_DEFUN([VLC_CONFIG_HELPER], [
   cat >> vlc-config.in << BLAH
@@ -343,7 +329,7 @@ EOF
     if grep '^nodist_SOURCES_'${mod}'' < "${modf}" >/dev/null 2>&1; then
         NODIST=''; else
         NODIST='#'; fi
-    cat >> m4/private.m4-tmp4 << EOF
+    cat >> m4/private.m4 << EOF
     ${mod}) list="\\\${list} ${dir}/lib${mod}" ;;
 EOF
 # Generation of modules/**/Makefile.am
@@ -404,25 +390,10 @@ EOF
   done
 done
 
-cat >> m4/private.m4-tmp1 << EOF
-])
-EOF
-cat m4/private.m4-tmp1 >> m4/private.m4 && rm -f m4/private.m4-tmp1
-cat >> m4/private.m4-tmp2 << EOF
-])
-EOF
-cat m4/private.m4-tmp2 >> m4/private.m4 && rm -f m4/private.m4-tmp2
-cat >> m4/private.m4-tmp3 << EOF
-])])
-EOF
-cat m4/private.m4-tmp3 >> m4/private.m4 && rm -f m4/private.m4-tmp3
-cat >> m4/private.m4-tmp4 << EOF
+cat >> m4/private.m4 << EOF
 BLAH
 ])
 EOF
-cat m4/private.m4-tmp4 >> m4/private.m4 && rm -f m4/private.m4-tmp4
-
-echo " done."
 
 ###
 ###  classic bootstrap stuff

diff --git a/configure.ac b/configure.ac
index 0f44734cab62f6d48553fbc34cd45432ffda77c6..12c37d0e48e17cefb76674907156cde1b2497996 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5950,9 +5950,6 @@ AS_IF([test "${SYS}" = "mingw32" || test "${enable_libtool}" != "no"], [
   FILE_LIBVLC_DLL=""
 ])
 
- dnl Import conditional variables generated by bootstrap
-VLC_CONDITIONALS
-
 dnl
 dnl  Stuff used by the program
 dnl
@@ -6019,9 +6016,6 @@ AC_SUBST(ALL_LINGUAS)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 AC_SUBST(FILE_LIBVLC_DLL)
 
-dnl Import substitutions generated by bootstrap
-VLC_SUBSTS
-
 dnl Create vlc-config.in
 VLC_OUTPUT_VLC_CONFIG_IN