diff options
| author | Bastien Nocera <hadess@hadess.net> | 2005-06-22 14:27:11 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2005-06-22 14:27:11 +0000 |
| commit | 3add902cb277bb8f7ea3063c415eb761c73c2ce3 (patch) | |
| tree | f15f524482dfee2382f0971019bf9a8d825bbc04 | |
| parent | 8bad53d3f971387c8676666e236303a1f998aba2 (diff) | |
| download | gnome-bluetooth-3add902cb277bb8f7ea3063c415eb761c73c2ce3.tar.gz | |
require the same version of libbtctl in both tests
2005-06-22 Bastien Nocera <hadess@hadess.net>
* configure.in: require the same version of libbtctl in both tests
2005-06-22 Bastien Nocera <hadess@hadess.net>
* POTFILES.in: force UTF-8 messages
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
4 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2005-06-22 Bastien Nocera <hadess@hadess.net> + + * configure.in: require the same version of libbtctl in both tests + 2005-06-18 Bastien Nocera <hadess@hadess.net> * python/manager.py: fix s/bluetooth/Bluetooth/ in user-visible diff --git a/configure.in b/configure.in index 192c8e5f..d9a397a2 100644 --- a/configure.in +++ b/configure.in @@ -39,10 +39,12 @@ AM_GCONF_SOURCE_2 GOB2_HOOK(2.0.0,[],[AC_MSG_ERROR([Cannot find GOB-2, install from http://www.5z.com/jirka/gob.html])]) +BTCTL_REQUIRED=0.5.0 + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no) -PKG_CHECK_MODULES(GNOME_BLUETOOTH, libglade-2.0 gobject-2.0 libgnomeui-2.0 >= 1.110.0 gconf-2.0 libbtctl >= 0.4) -PKG_CHECK_MODULES(GNOME_BLUETOOTH_PYTHON, libglade-2.0 gobject-2.0 libgnomeui-2.0 >= 1.110.0 gconf-2.0 pygtk-2.0 libbtctl >= 0.5.0) +PKG_CHECK_MODULES(GNOME_BLUETOOTH, libglade-2.0 gobject-2.0 libgnomeui-2.0 >= 1.110.0 gconf-2.0 libbtctl >= $BTCTL_REQUIRED) +PKG_CHECK_MODULES(GNOME_BLUETOOTH_PYTHON, libglade-2.0 gobject-2.0 libgnomeui-2.0 >= 1.110.0 gconf-2.0 pygtk-2.0 libbtctl >= $BTCTL_REQUIRED) AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) DEFSDIR=`pkg-config --variable=defsdir pygtk-2.0` diff --git a/po/ChangeLog b/po/ChangeLog index 8a30e26d..768f452e 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2005-06-22 Bastien Nocera <hadess@hadess.net> + + * POTFILES.in: force UTF-8 messages + 2005-06-21 Hendrik Brandt <heb@gnome-de.org> * de.po: Updated German translation. diff --git a/po/POTFILES.in b/po/POTFILES.in index 6d358e6b..c9d8e843 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. +[encoding: UTF-8] data/gnome-obex-server.schemas.in libegg/libegg/iconlist/eggiconlist.c libegg/libegg/tray/eggstatusicon.c |