summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Pablo Ugarte <jpu@src.gnome.org>2006-10-18 19:08:19 +0000
committerJuan Pablo Ugarte <jpu@src.gnome.org>2006-10-18 19:08:19 +0000
commitdd2645dc25a34754dfba510643f8d2a9b6353548 (patch)
tree011317fd502cc0d839e951276e2149f94a273a80
parent3a732d02885addc0548ae06c1483d5f1dcd11108 (diff)
downloadglade-dd2645dc25a34754dfba510643f8d2a9b6353548.tar.gz
added po/LINGUAS file
-rw-r--r--ChangeLog6
-rw-r--r--configure.in33
-rw-r--r--po/LINGUAS24
3 files changed, 61 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ccd97aab..81d94fa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-18 Vincent Geddes <vincent.geddes@gmail.com>
+
+ * po/LINGUAS: new file
+
+ * configure.in: adapted to use LINGUAS file
+
2006-10-17 Vincent Geddes <vincent.geddes@gmail.com>
* COPYING: relicense pixmaps under GNU LGPL
diff --git a/configure.in b/configure.in
index 2393507a..5633053b 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-AC_PROG_INTLTOOL([0.29])
+IT_PROG_INTLTOOL([0.35.0])
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(DLLTOOL, dlltool)
@@ -41,7 +41,6 @@ dnl ================================================================
GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.])
-ALL_LINGUAS="az da en_CA en_GB es fr ja ko ms nb nn pl pt pt_BR ru sk sv ta tr uk vi zh_CN"
AM_GLIB_GNU_GETTEXT
dnl ================================================================
@@ -57,6 +56,31 @@ AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
dnl ================================================================
+dnl Check for Python
+dnl ================================================================
+AC_ARG_ENABLE(python,
+[ --disable-python disable python scripting module],
+ check_python=$enableval, check_python=yes)
+
+if test x"$check_python" = x"yes"; then
+ PYTHON="nop"
+ AC_PATH_PROGS([PYTHON], [python])
+
+ if test "$PYTHON" != "nop"; then
+ PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= 2.8.0)
+ PYTHON_CFLAGS="`$PYTHON -c "from distutils import sysconfig; getvar = sysconfig.get_config_var; flags = ['-I' + sysconfig.get_python_inc(), '-I' + sysconfig.get_python_inc(plat_specific=True)]; print ' '.join(flags)"` $PYGTK_CFLAGS"
+ PYTHON_LIBS="`$PYTHON -c "from distutils import sysconfig; pyver = sysconfig.get_config_var('VERSION'); getvar = sysconfig.get_config_var; libs = getvar('LIBS').split() + getvar('SYSLIBS').split(); libs.append('-lpython'+pyver); libs.insert(0, '-L' + getvar('LIBPL')); print ' '.join(libs)"` $PYGTK_LIBS"
+ AC_SUBST(PYTHON_CFLAGS)
+ AC_SUBST(PYTHON_LIBS)
+ have_python=yes
+ fi
+else
+ have_python=no
+fi
+
+AM_CONDITIONAL(BUILD_PYTHON, test x"$have_python" = "xyes")
+
+dnl ================================================================
dnl Check for optional gnome libs
dnl ================================================================
AC_ARG_ENABLE(gnome,
@@ -93,8 +117,10 @@ glade_datadir='${datadir}/${PACKAGE}'
glade_libdir='${libdir}/${PACKAGE}'
glade_catalogsdir='${glade_datadir}/catalogs'
glade_pixmapsdir='${glade_datadir}/pixmaps'
+glade_scriptsdir='${glade_datadir}/script-do'
glade_modulesdir='${glade_libdir}/modules'
glade_pluginsdir='${glade_libdir}/plugins'
+glade_bindingsdir='${glade_libdir}/bindings'
glade_icondir='${datadir}/pixmaps'
glade_localedir='${prefix}/${DATADIRNAME}/locale'
AC_SUBST(glade_version)
@@ -103,7 +129,9 @@ AC_SUBST(glade_libdir)
AC_SUBST(glade_catalogsdir)
AC_SUBST(glade_modulesdir)
AC_SUBST(glade_pluginsdir)
+AC_SUBST(glade_bindingsdir)
AC_SUBST(glade_pixmapsdir)
+AC_SUBST(glade_scriptsdir)
AC_SUBST(glade_icondir)
AC_SUBST(glade_localedir)
@@ -129,5 +157,6 @@ Configuration:
Source code location: ${srcdir}
Compiler: ${CC}
GnomeUI Catalog: ${have_gnome}
+ Python Scripting: ${have_python}
"
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 00000000..fbf102ed
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,24 @@
+# please keep this list sorted alphabetically
+#
+az
+da
+en_CA
+en_GB
+es
+fr
+ja
+ko
+ms
+nb
+nn
+pl
+pt
+pt_BR
+ru
+sk
+sv
+ta
+tr
+uk
+vi
+zh_CN