Attachment #214044 for bug #296924

View | Details | Raw Unified | Return to bug 296924
Collapse All | Expand All

Lines 1-7 Link Here

(-)a/gtkmozembed/Makefile.am (-1 / +1 lines)
1	# require automake-1.5	1	# require automake-1.5
2	AUTOMAKE_OPTIONS = 1.5	2	AUTOMAKE_OPTIONS = 1.5
3		3
4	INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTKMOZEMBED_CFLAGS)	4	INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTKMOZEMBED_CFLAGS) $(NSPR_CFLAGS)
5		5
6	defsdir = $(datadir)/pygtk/2.0/defs	6	defsdir = $(datadir)/pygtk/2.0/defs
7	defs_DATA = gtkmozembed.defs	7	defs_DATA = gtkmozembed.defs

Lines 24-29 Link Here

(-)a/configure.ac (+6 lines)
24	m4_define(gksu_required_version, 1.2.5)	24	m4_define(gksu_required_version, 1.2.5)
25	m4_define(gksu2_required_version, 2.0.4)	25	m4_define(gksu2_required_version, 2.0.4)
26	m4_define(gksuui_required_version, 1.0.3)	26	m4_define(gksuui_required_version, 1.0.3)
		27	m4_define(nspr_required_version, 4.7.4)
27		28
28	AC_INIT(gnome-python-extras, gnome_python_extras_version,	29	AC_INIT(gnome-python-extras, gnome_python_extras_version,
29	[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python])	30	[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python])
Lines 62-67 Link Here
62	AM_PATH_PYTHON(2.3)	63	AM_PATH_PYTHON(2.3)
63	AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])	64	AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
64		65
		66	dnl check for nspr
		67	AC_MSG_CHECKING(for system nspr >= nspr_required_version )
		68	PKG_CHECK_MODULES(NSPR, nspr >= nspr_required_version)
		69	AC_SUBST(NSPR_CFLAGS)
		70
65	dnl check for pygtk	71	dnl check for pygtk
66	PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)	72	PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)
67	AC_SUBST(PYGTK_CFLAGS)	73	AC_SUBST(PYGTK_CFLAGS)

Return to bug 296924