* configure.ac: print warning and hint if ./mkinstalldirs is not

	  created (incompatibility between automake > 1.8 and all gettext
	  at least up to 0.14.4.

	* TROUBLESHOOTING: added tips for missing ./mkinstalldirs and
	  po/Makefile.in.in


git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1125 f01d2545-417e-4e96-918e-98f8d0dbbcb6

1 files changed, 7 insertions, 42 deletions

diff --git a/autogen.sh b/autogen.sh
index 10f52fb..66131d2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,48 +27,6 @@ autoreconf --force --install
 echo "Running intltoolize"
 intltoolize --copy --force --automake
 
-# For the Debian package build
-test -d debian && {
-	# link these in Debian builds
-	rm -f config.sub config.guess
-	ln -s /usr/share/misc/config.sub .
-	ln -s /usr/share/misc/config.guess .
-
-	# refresh list of executable scripts, to avoid possible breakage if
-	# upstream tarball does not include the file or if it is mispackaged
-	# for whatever reason.
-	[ "$1" == "updateexec" ] && {
-		echo Generating list of executable files...
-		rm -f debian/executable.files
-		find . -type f -perm +111 ! -name '.*' -fprint debian/executable.files
-	}
-
-	# Remove any files in upstream tarball that we don't have in the Debian
-	# package (because diff cannot remove files)
-	version=`dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]\+$//'`
-	source=`dpkg-parsechangelog | awk '/Source:/ { print $2 }' | tr -d ' '`
-	if test -r ../${source}_${version}.orig.tar.gz ; then
-		echo Generating list of files that should be removed...
-		rm -f debian/deletable.files
-		touch debian/deletable.files
-		[ -e debian/tmp ] && rm -rf debian/tmp
-		mkdir debian/tmp
-		( cd debian/tmp ; tar -zxf ../../../${source}_${version}.orig.tar.gz )
-		find debian/tmp/ -type f ! -name '.*' -print0 | xargs -0 -ri echo '{}' | \
-		  while read -r i ; do
-			if test -e "${i}" ; then
-				filename=$(echo "${i}" | sed -e 's#.*debian/tmp/[^/]\+/##')
-				test -e "${filename}" || echo "${filename}" >>debian/deletable.files
-			fi
-		  done
-		rm -fr debian/tmp
-	else
-		echo Emptying list of files that should be deleted...
-		rm -f debian/deletable.files
-		touch debian/deletable.files
-	fi
-}
-
 conf_flags="--enable-maintainer-mode"
 
 srcdir=`dirname $0`
@@ -82,4 +40,11 @@ else
   echo Skipping configure process.
 fi
 
+if [ ! -f $srcdir/mkinstalldirs ]; then
+    echo '******* WARNING *******'
+    echo ./mkinstalldirs does not exist. If \'make install\' or \'make dist\' fails
+    echo because of this, copy it from somewhere else AND RUN ./autogen.sh AGAIN.
+    echo The gettext package on your system should contain a copy.
+    echo You can determine its location with \'locate gettext/mkinstalldirs\'. 
+fi
 exit 0