Attachment #211207 for bug #273351




AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
AC_SUBST([PYTHON_INCLUDES])

dnl ****
dnl custom gajim pyfiles installation
dnl ****
AC_ARG_WITH(custom-basedir,
  [AS_HELP_STRING([--with-custom-basedir=DIR],
	[install gajim sources in DIR instead of DATADIR/gajim/src])]
,
	AC_SUBST([gajim_basedir], [$withval])
,
	AC_SUBST([gajim_basedir], [\${datadir}/\${PACKAGE}/src])
)

test "x${gajim_basedir}" = "xyes" -o "x${gajim_basedir}" = "xno" && \
	AC_MSG_FAILURE([--with-custom-basedir=DIR needs a path as argument])

AS_AC_EXPAND(GAJIM_BASEDIR, "${gajim_basedir}")
AS_AC_EXPAND(DATADIR, "${datadir}")
AS_AC_EXPAND(LIBDIR, "${libdir}")
AS_AC_EXPAND(DOCDIR, "${docdir}")

***************************** 
  Build features:
    trayicon ......... ${have_trayicon}

  Installation:
    Python modules ... ${GAJIM_BASEDIR}
    C modules ........ ${LIBDIR}/gajim
    Data ............. ${DATADIR}/gajim/data
*****************************"

Lines 5-11 Link Here

(-)a/data/Makefile.am (-1 / +1 lines)
5	desktop_in_files = gajim.desktop.in.in	5	desktop_in_files = gajim.desktop.in.in
6	desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)	6	desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
7		7
8	installdefsdir = $(pkgdatadir)/src/common	8	installdefsdir = $(gajim_basedir)/common
9	installdefs_DATA = defs.py	9	installdefs_DATA = defs.py
10		10
11	soundsdir = $(pkgdatadir)/data/sounds	11	soundsdir = $(pkgdatadir)/data/sounds

Lines 32-37 Link Here

(-)a/scripts/gajim.in (-1 / +1 lines)
32	export datadir=@DATADIR@/gajim	32	export datadir=@DATADIR@/gajim
33	PYTHON_EXEC=@PYTHON@	33	PYTHON_EXEC=@PYTHON@
34		34
35	cd ${datadir}/src	35	cd @GAJIM_BASEDIR@
36	export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"	36	export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
37	exec ${PYTHON_EXEC} -OO $APP.py "$@"	37	exec ${PYTHON_EXEC} -OO $APP.py "$@"




		    --override $(srcdir)/trayicon.override \
		    $(srcdir)/trayicon.defs > $@
endif
gajimsrcdir = $(gajim_basedir)
gajimsrc_PYTHON = $(srcdir)/*.py

gajimsrc1dir = $(gajim_basedir)/common
gajimsrc1_PYTHON = \
				$(srcdir)/common/*.py

gajimsrc2dir = $(gajim_basedir)/common/xmpp
gajimsrc2_PYTHON = \
				$(srcdir)/common/xmpp/*.py

gajimsrc3dir = $(gajim_basedir)/common/zeroconf
gajimsrc3_PYTHON = \
				$(srcdir)/common/zeroconf/*.py

gajimsrc4dir = $(gajim_basedir)/command_system
gajimsrc4_PYTHON = \
				   $(srcdir)/command_system/*.py

gajimsrc5dir = $(gajim_basedir)/command_system/implementation
gajimsrc5_PYTHON = \
				   $(srcdir)/command_system/implementation/*.py


Return to bug 273351

Lines 65-70 Link Here

(-)a/configure.ac (+21 lines)
65	AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])	65	AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
66	AC_SUBST([PYTHON_INCLUDES])	66	AC_SUBST([PYTHON_INCLUDES])
67		67
		68	dnl ****
		69	dnl custom gajim pyfiles installation
		70	dnl ****
		71	AC_ARG_WITH(custom-basedir,
		72	[AS_HELP_STRING([--with-custom-basedir=DIR],
		73	[install gajim sources in DIR instead of DATADIR/gajim/src])]
		74	,
		75	AC_SUBST([gajim_basedir], [$withval])
		76	,
		77	AC_SUBST([gajim_basedir], [\${datadir}/\${PACKAGE}/src])
		78	)
		79
		80	test "x${gajim_basedir}" = "xyes" -o "x${gajim_basedir}" = "xno" && \
		81	AC_MSG_FAILURE([--with-custom-basedir=DIR needs a path as argument])
		82
		83	AS_AC_EXPAND(GAJIM_BASEDIR, "${gajim_basedir}")
68	AS_AC_EXPAND(DATADIR, "${datadir}")	84	AS_AC_EXPAND(DATADIR, "${datadir}")
69	AS_AC_EXPAND(LIBDIR, "${libdir}")	85	AS_AC_EXPAND(LIBDIR, "${libdir}")
70	AS_AC_EXPAND(DOCDIR, "${docdir}")	86	AS_AC_EXPAND(DOCDIR, "${docdir}")
Lines 95-98 Link Here
95	*****************************	111	*****************************
96	Build features:	112	Build features:
97	trayicon ......... ${have_trayicon}	113	trayicon ......... ${have_trayicon}
		114
		115	Installation:
		116	Python modules ... ${GAJIM_BASEDIR}
		117	C modules ........ ${LIBDIR}/gajim
		118	Data ............. ${DATADIR}/gajim/data
98	*****************************"	119	*****************************"

Lines 26-51 Link Here

(-)a/src/Makefile.am (-6 / +6 lines)
26	--override $(srcdir)/trayicon.override \	26	--override $(srcdir)/trayicon.override \
27	$(srcdir)/trayicon.defs > $@	27	$(srcdir)/trayicon.defs > $@
28	endif	28	endif
29	gajimsrcdir = $(pkgdatadir)/src	29	gajimsrcdir = $(gajim_basedir)
30	gajimsrc_PYTHON = $(srcdir)/*.py	30	gajimsrc_PYTHON = $(srcdir)/*.py
31		31
32	gajimsrc1dir = $(pkgdatadir)/src/common	32	gajimsrc1dir = $(gajim_basedir)/common
33	gajimsrc1_PYTHON = \	33	gajimsrc1_PYTHON = \
34	$(srcdir)/common/*.py	34	$(srcdir)/common/*.py
35		35
36	gajimsrc2dir = $(pkgdatadir)/src/common/xmpp	36	gajimsrc2dir = $(gajim_basedir)/common/xmpp
37	gajimsrc2_PYTHON = \	37	gajimsrc2_PYTHON = \
38	$(srcdir)/common/xmpp/*.py	38	$(srcdir)/common/xmpp/*.py
39		39
40	gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf	40	gajimsrc3dir = $(gajim_basedir)/common/zeroconf
41	gajimsrc3_PYTHON = \	41	gajimsrc3_PYTHON = \
42	$(srcdir)/common/zeroconf/*.py	42	$(srcdir)/common/zeroconf/*.py
43		43
44	gajimsrc4dir = $(pkgdatadir)/src/command_system	44	gajimsrc4dir = $(gajim_basedir)/command_system
45	gajimsrc4_PYTHON = \	45	gajimsrc4_PYTHON = \
46	$(srcdir)/command_system/*.py	46	$(srcdir)/command_system/*.py
47		47
48	gajimsrc5dir = $(pkgdatadir)/src/command_system/implementation	48	gajimsrc5dir = $(gajim_basedir)/command_system/implementation
49	gajimsrc5_PYTHON = \	49	gajimsrc5_PYTHON = \
50	$(srcdir)/command_system/implementation/*.py	50	$(srcdir)/command_system/implementation/*.py
51		51