X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=autogen.sh;h=c1603ea64051039a234ea491b2c43bd0b89a4850;hb=50f5ef3cedbeaa251a1e838bf5045a9dc7dda1ee;hp=f1624cd7a121531b88bbf4b7f69514b57148ae60;hpb=55c5b71c9d49e5d6b39c3b5fa6f4ce966193c881;p=geeqie.git

diff --git a/autogen.sh b/autogen.sh
index f1624cd7..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
@@ -120,7 +129,7 @@ do
   fi
 done
 
-conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+conf_flags="--enable-maintainer-mode" #--enable-iso-c
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...