[ekiga] [windows] Fix locale directory
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] [windows] Fix locale directory
- Date: Thu, 9 Aug 2012 10:20:18 +0000 (UTC)
commit 171b25341dbee80acca8042c7304fee6de10a361
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Thu Aug 9 12:15:38 2012 +0200
[windows] Fix locale directory
Subtle bug appearing because config.h was included *after* winpaths.h
(in main.cpp); both of them defined DATA_DIR, but winpaths' one is the
good one. Now, DATA_DIR is not defined in config.h anymore (for
Windows).
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ca6de3c..253bd56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -814,10 +814,14 @@ gnomeconfdir=`eval "echo ${sysconfdir}"`
AC_SUBST(gnomedatadir)
AC_SUBST(gnomeconfdir)
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(DATA_DIR, "${ac_default_prefix}/${DATADIRNAME}",[fix])
-else
- AC_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/${DATADIRNAME}",[fix])
+# on Windows, data_dir is obtained at run-time, since it depends on
+# the installation directory, so do not define it (to avoids bugs)
+if test "x${gm_platform}" != "xmingw" ; then
+ if test "x${prefix}" = "xNONE"; then
+ AC_DEFINE_UNQUOTED(DATA_DIR, "${ac_default_prefix}/${DATADIRNAME}",[fix])
+ else
+ AC_DEFINE_UNQUOTED(DATA_DIR, "${prefix}/${DATADIRNAME}",[fix])
+ fi
fi
dnl ###########################################################################
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]