yet another crash/freeze in ungrab. IMPORTANT: the document_done calls and others...

[inkscape.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c22fc4f8964e3b11f8a52d8a811f192b20a4ba7e..02123e56bc3af76ff8fae25fdc12f9d076476790 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ GETTEXT_PACKAGE="AC_PACKAGE_NAME"
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="am az be bg ca cs da de dz el en_GB en_CA es es_MX et fi fr ga gl hr hu it ja ko lt mk mn nb ne nl nn pa pl pt pt_BR ru rw sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am az be bg ca cs da de dz el en_GB en_CA en_US@piglatin es es_MX et fi fr ga gl hr hu it ja ko lt mk mn nb ne nl nn pa pl pt pt_BR ru rw sk sl sq sr sr@Latn sv th tr uk vi zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -756,15 +756,17 @@ dnl Override the default g_ascii_strtod
 AC_DEFINE(g_ascii_strtod, fixed_g_ascii_strtod, [Pre-1.107 gstrfuncs.c version of g_ascii_strtod is broken])
 
 dnl Figure out where the datadir actually is
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    runtime_datadir="${ac_default_prefix}/share"
-  else
-    runtime_datadir="${prefix}/share"
-  fi
-else
-  runtime_datadir="${datadir}"
-fi
+dnl http://autoconf-archive.cryp.to/ac_define_dir.html
+prefix_NONE=
+exec_prefix_NONE=
+test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+eval runtime_datadir="${datadir}"
+eval runtime_datadir="${runtime_datadir}"
+test "$prefix_NONE" && prefix=NONE
+test "$exec_prefix_NONE" && exec_prefix=NONE
 
 inkscape_sharedir="${runtime_datadir}/${PACKAGE_NAME}"