2006-09-13 Benedikt Meurer <benny@xfce.org>

	* configure.in.in, Makefile.am: Place automake options into
	  configure.in.in instead of Makefile.am and add the tar-ustar
	  option to fix building distributions on system where tar defaults
	  to the deprecated V7 format. Bug #2304.




(Old svn revision: 23144)

ChangeLog

+2006-09-13	Benedikt Meurer <benny@xfce.org>
+
+	* configure.in.in, Makefile.am: Place automake options into
+	  configure.in.in instead of Makefile.am and add the tar-ustar
+	  option to fix building distributions on system where tar defaults
+	  to the deprecated V7 format. Bug #2304.
+
 2006-09-13	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-dbus-client.c: Use default dbus connection timeout.

Makefile.am

@@ -14,10 +14,6 @@ SUBDIRS =								\
 	examples							\
 	plugins
 
-AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2
-
 distclean-local:
 	rm -rf *.spec *.cache *~
 

configure.in.in

@@ -38,7 +38,7 @@ AC_REVISION([$Id$])
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()