X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=autogen.sh;h=c1603ea64051039a234ea491b2c43bd0b89a4850;hp=8a188e3d277799e3dfefbe3469852ba182016ec2;hb=a40d8f1e7f4bace37758d6f0bc4f598652b77b69;hpb=4b69e1199fe33fa8d904b21a2ba3cc85f7b59e81

diff --git a/autogen.sh b/autogen.sh
index 8a188e3d..c1603ea6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,6 +35,12 @@ DIE=0
   }
 }
 
+(intltoolize --version) < /dev/null > /dev/null 2>&1 || {
+  echo
+  echo "**Error**: You must have \`intltoolize' installed" 
+  DIE=1
+}
+
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
@@ -99,8 +105,11 @@ do
 	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
 	  echo "Running glib-gettextize..."
 	  echo "no" | glib-gettextize --force --copy
-	  if [ -r po/Makefile.in.in.patch ]; then
-		patch po/Makefile.in.in < po/Makefile.in.in.patch
+	  echo "Running intltoolize"
+	  intltoolize --copy --force --automake
+	  if intltoolize --version | grep -q ' 0.40.6'; then
+		  echo "Workaround intltoolize 0.40.6 bug (LINGUAS)"
+		  sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in
 	  fi
 	  echo "Making $dr/aclocal.m4 writable ..."
 	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4