[DVDnav-discuss] r1105 - in trunk/libdvdnav: Makefile.am configure.ac

[dan]

Author: dan
Date: Wed Jun 18 17:06:33 2008
New Revision: 1105

Log:
Drop depcomp hack now that automake-1.6 is required

The hack to distribute the depcomp script needed for automake versions
before 1.5 can be dropped since 1.6 is required now.


Modified:
   trunk/libdvdnav/Makefile.am
   trunk/libdvdnav/configure.ac

Modified: trunk/libdvdnav/Makefile.am
==============================================================================
--- trunk/libdvdnav/Makefile.am	(original)
+++ trunk/libdvdnav/Makefile.am	Wed Jun 18 17:06:33 2008
@@ -17,15 +17,14 @@ EXTRA_DIST = autogen.sh \
 	     missing \
 	     mkinstalldirs \
 	     README \
-	     TODO \
-	     $(DEPCOMP)
+	     TODO
 
 MOSTLYCLEANFILES += $(PACKAGE)_$(VERSION).tar.gz \
 	$(distdir).tar.gz $(PACKAGE).tgz package_descriptions
 
 MAINTAINERCLEANFILES += configure $(ACLOCAL_M4) config.h.in \
 	ltmain.sh config.guess config.sub install-sh missing \
-	mkinstalldirs $(DEPCOMP)
+	mkinstalldirs
 
 world:
 	@$(MAKE) clean all install 2> warnings.log

Modified: trunk/libdvdnav/configure.ac
==============================================================================
--- trunk/libdvdnav/configure.ac	(original)
+++ trunk/libdvdnav/configure.ac	Wed Jun 18 17:06:33 2008
@@ -235,14 +235,6 @@ INCLUDES='-I$(top_srcdir) $(DVDNAV_CFLAG
 AC_SUBST(INCLUDES)
 
 dnl ---------------------------------------------
-dnl It seems automake 1.5 don't take care about this script
-dnl ---------------------------------------------
-if test ! -z $am_depcomp; then
-	DEPCOMP="depcomp"
-fi
-AC_SUBST(DEPCOMP)
-
-dnl ---------------------------------------------
 dnl Output configuration files
 dnl ---------------------------------------------
 AC_OUTPUT([