Revert stuff from commit 1431 that wasn't supposed to be there.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1432 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/Makefile.am b/Makefile.am
index 765e8fa..1b77187 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = config.rpath m4/ChangeLog  bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
-SUBDIRS= libltdl src doxygen
+EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
+SUBDIRS=libltdl src doxygen
 
 MAINTAINERCLEANFILES =
 noinst_DATA =
@@ -46,5 +46,3 @@ doxygen:
        $(MAKE) -C doxygen doxygen
 
 .PHONY: homepage distcleancheck doxygen
-
-ACLOCAL_AMFLAGS = -I m4

diff --git a/configure.ac b/configure.ac
index 68ad672..65a99a0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -772,7 +772,6 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "x1"])
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
-po/Makefile.in
 libpulse.pc
 libpulse-simple.pc
 libpulse-browse.pc