Attachment #181854 for bug #251298




AC_SUBST([PYTHON_INCLUDES])

AS_AC_EXPAND(DATADIR, "${datadir}")
AS_AC_EXPAND(LIBDIR, "${libdir}")
AS_AC_EXPAND(LIBDIR, ${libdir})

AS_AC_EXPAND(DOCDIR, "${docdir}")
AS_AC_EXPAND(LOCALEDIR, "${localedir}")

AC_SUBST(VERSION)
AC_SUBST(PACKAGE)
AC_SUBST(DATADIR)
AC_SUBST(LIBDIR)
AS_AC_EXPAND(DATADIR, "${DATADIR}")
AC_SUBST(DOCDIR)
AS_AC_EXPAND(DOCDIR, "${DOCDIR}")

AC_CONFIG_FILES([ 
	Makefile

Lines 4-7 Link Here

(-)a/data/defs.py.in (+2 lines)
4		4
5	datadir = "@DATADIR@"	5	datadir = "@DATADIR@"
6		6
		7	localedir = "@LOCALEDIR@"
		8
7	version = "@VERSION@"	9	version = "@VERSION@"




dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
dnl autostars m4 macro for expanding directories using configure's prefix

dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>

dnl Copying and distribution of this file, with or without modification,
dnl are permitted in any medium without royalty provided the copyright
dnl notice and this notice are preserved.

dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)

dnl example:
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local



  dnl if no prefix given, then use /usr/local, the default prefix
  if test "x$prefix" = "xNONE"; then
    prefix="$ac_default_prefix"
  fi
  dnl if no exec_prefix given, then use prefix
  if test "x$exec_prefix" = "xNONE"; then

  dnl loop until it doesn't change anymore
  while true; do
    new_full_var="`eval echo $full_var`"
    if test "x$new_full_var" = "x$full_var"; then break; fi
    full_var=$new_full_var
  done


Lines 25-30 Link Here

(-)a/src/common/defs.py (+1 lines)
25		25
26	docdir = '../'	26	docdir = '../'
27	datadir = '../'	27	datadir = '../'
		28	localedir = '../po'
28		29
29	version = '0.12.1.2-svn'	30	version = '0.12.1.2-svn'
30		31

Lines 26-35 Link Here

(-)a/src/common/i18n.py (-4 / +2 lines)
26	import os	26	import os
27		27
28	APP = 'gajim'	28	APP = 'gajim'
29	if os.path.isdir('../po'):	29	import defs
30	DIR = '../po'	30	DIR = defs.localedir
31	else:
32	DIR = '../../locale'
33		31
34	# set '' so each part of the locale that should be modified is set	32	# set '' so each part of the locale that should be modified is set
35	# according to the environment variables	33	# according to the environment variables

Lines 61-67 Link Here

(-)a/src/gtkgui_helpers.py (-1 / +1 lines)
61	screen_w = gtk.gdk.screen_width()	61	screen_w = gtk.gdk.screen_width()
62	screen_h = gtk.gdk.screen_height()	62	screen_h = gtk.gdk.screen_height()
63		63
64	GLADE_DIR = os.path.join('..', 'data', 'glade')	64	GLADE_DIR = os.path.join(gajim.DATA_DIR, 'glade')
65	def get_glade(file_name, root = None):	65	def get_glade(file_name, root = None):
66	file_path = os.path.join(GLADE_DIR, file_name)	66	file_path = os.path.join(GLADE_DIR, file_name)
67	return gtk.glade.XML(file_path, root=root, domain=i18n.APP)	67	return gtk.glade.XML(file_path, root=root, domain=i18n.APP)

Return to bug 251298

Lines 174-191 Link Here

(-)a/configure.ac (-8 / +2 lines)
174	AC_SUBST([PYTHON_INCLUDES])	174	AC_SUBST([PYTHON_INCLUDES])
175		175
176	AS_AC_EXPAND(DATADIR, "${datadir}")	176	AS_AC_EXPAND(DATADIR, "${datadir}")
177		177	AS_AC_EXPAND(LIBDIR, "${libdir}")
178	AS_AC_EXPAND(LIBDIR, ${libdir})
179
180	AS_AC_EXPAND(DOCDIR, "${docdir}")	178	AS_AC_EXPAND(DOCDIR, "${docdir}")
		179	AS_AC_EXPAND(LOCALEDIR, "${localedir}")
181		180
182	AC_SUBST(VERSION)	181	AC_SUBST(VERSION)
183	AC_SUBST(PACKAGE)	182	AC_SUBST(PACKAGE)
184	AC_SUBST(DATADIR)
185	AC_SUBST(LIBDIR)
186	AS_AC_EXPAND(DATADIR, "${DATADIR}")
187	AC_SUBST(DOCDIR)
188	AS_AC_EXPAND(DOCDIR, "${DOCDIR}")
189		183
190	AC_CONFIG_FILES([	184	AC_CONFIG_FILES([
191	Makefile	185	Makefile

Lines 1-6 Link Here

(-)a/m4/acinclude.m4 (-4 / +13 lines)
		1	dnl as-ac-expand.m4 0.2.0 -- autoconf --
		2	dnl autostars m4 macro for expanding directories using configure's prefix
		3
		4	dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
		5
		6	dnl Copying and distribution of this file, with or without modification,
		7	dnl are permitted in any medium without royalty provided the copyright
		8	dnl notice and this notice are preserved.
		9
1	dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)	10	dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
2	dnl	11
3	dnl example	12	dnl example:
4	dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)	13	dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
5	dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local	14	dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
6		15
Lines 15-21 Link Here
15		24
16	dnl if no prefix given, then use /usr/local, the default prefix	25	dnl if no prefix given, then use /usr/local, the default prefix
17	if test "x$prefix" = "xNONE"; then	26	if test "x$prefix" = "xNONE"; then
18	prefix=$ac_default_prefix	27	prefix="$ac_default_prefix"
19	fi	28	fi
20	dnl if no exec_prefix given, then use prefix	29	dnl if no exec_prefix given, then use prefix
21	if test "x$exec_prefix" = "xNONE"; then	30	if test "x$exec_prefix" = "xNONE"; then
Lines 26-32 Link Here
26	dnl loop until it doesn't change anymore	35	dnl loop until it doesn't change anymore
27	while true; do	36	while true; do
28	new_full_var="`eval echo $full_var`"	37	new_full_var="`eval echo $full_var`"
29	if test "x$new_full_var"="x$full_var"; then break; fi	38	if test "x$new_full_var" = "x$full_var"; then break; fi
30	full_var=$new_full_var	39	full_var=$new_full_var
31	done	40	done
32		41