* 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

3 files changed, 40 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index fd3a0f3..349aa3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-19  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* 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
+
 2005-10-17  Christophe Fergeau  <teuf@gnome.org>
 
 	* src/db-image-parser.c: (get_pixel_data),
diff --git a/TROUBLESHOOTING b/TROUBLESHOOTING
index 9a1670c..0f27ef6 100644
--- a/TROUBLESHOOTING
+++ b/TROUBLESHOOTING
@@ -1,5 +1,5 @@
-Possible errors:
-----------------
+Possible problems:
+------------------
 
 * If you get an error stating
 
@@ -14,6 +14,7 @@ will do that for you.
 
 
 ------------------------------------------------------------
+
 * If you get an error stating
 
 "checking for XML::Parser... configure: error: XML::Parser perl module is required for intltool"
@@ -26,6 +27,24 @@ will do that for you.
 
 
 ------------------------------------------------------------
+
+* "/bin/sh: ../mkinstalldirs: No such file or directory"
+
+If you get this error, you are probably using automake >= 1.8.
+Automake 1.8 does no longer install the mkinstalldirs file, and
+gettext 0.14.4 does still depend on it...
+
+Do a 'locate gettext/mkinstalldirs' and copy it over, then run
+./autogen.sh again for good measure.
+
+------------------------------------------------------------
+
+* "config.status: error: cannot find input file: po/Makefile.in.in"
+
+Upgrade intltool. 0.33 seems to work.
+
+------------------------------------------------------------
+
 * Compiling for 64bit systems
 
 The current automake/autobuild setup doesn't set the correct
@@ -36,5 +55,7 @@ installation prefix is '/opt/gnome' use the following:
 
 ./autogen.sh --prefix=/opt/gnome --enable-libsuffix=64 --libdir=/opt/gnome/lib6
 
-
 If you use a diferent prefix, replace '/opt/gnome' accordingly.
+
+Can someone send a patch how to automate all this?
+(gtkpod-devel@lists.sourceforge.net)
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