Attachment #155803 for bug #221003




GNOME_REQUIRED_VERSION=2.20.0
ART_REQUIRED_VERSION=2.3.19

AC_ARG_ENABLE(art,
[  --disable-art Turn off art-sharp],
[case "${enableval}" in
  yes) enable_libart=yes  ;;
  no) enable_libart=no  ;;
esac]
,[enable_libart=yes])

if test "x$enable_libart" = "xyes"; then
	PKG_CHECK_MODULES(LIBART, libart-2.0 >= $ART_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)
	AC_SUBST(LIBART_CFLAGS)
	AC_SUBST(LIBART_LIBS)
fi

AC_ARG_ENABLE(gnomevfs,
[  --disable-gnomevfs Turn off gnomevfs-sharp],
[case "${enableval}" in
  yes) enable_gnomevfs=yes  ;;
  no) enable_gnomevfs=no  ;;
esac]
,[enable_gnomevfs=yes])

if test "x$enable_gnomevfs" = "xyes"; then
	PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOME_REQUIRED_VERSION, enable_gnomevfs=yes, enable_gnomevfs=no)
	AC_SUBST(GNOMEVFS_CFLAGS)
	AC_SUBST(GNOMEVFS_LIBS)
fi

GNOMECANVAS_REQUIRED_VERSION=2.20.0
GNOMEPANEL_REQUIRED_VERSION=2.20.0
GNOMEPRINT_REQUIRED_VERSION=2.18.0

AC_ARG_ENABLE(gnome,
[  --disable-gnome Turn off gnome-sharp],
[case "${enableval}" in
  yes) enable_gnome=yes  ;;
  no) enable_gnome=no  ;;
esac]
,[enable_gnome=yes])

if test "x$enable_gnome" = "xyes"; then
if test "x$enable_libart" = "xyes"; then
	PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOMEPRINT_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION libpanelapplet-2.0 >= $GNOMEPANEL_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
	AC_SUBST(GNOME_CFLAGS)
	AC_SUBST(GNOME_LIBS)
fi
fi

AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes")
AM_CONDITIONAL(ENABLE_GNOMEVFS, test "x$enable_gnomevfs" = "xyes")

Lines 1-6 Link Here

(-)gnome-sharp-2.20.0/gconf/tools/Makefile.am (+2 lines)
		1	if ENABLE_GNOME
1	assemblydir = $(prefix)/lib/gtk-sharp-2.0	2	assemblydir = $(prefix)/lib/gtk-sharp-2.0
2	assembly_DATA = gconfsharp-schemagen.exe	3	assembly_DATA = gconfsharp-schemagen.exe
3	bin_SCRIPTS = gconfsharp2-schemagen	4	bin_SCRIPTS = gconfsharp2-schemagen
		5	endif
4	CLEANFILES = gconfsharp-schemagen.exe	6	CLEANFILES = gconfsharp-schemagen.exe
5	DISTCLEANFILES = gconfsharp2-schemagen	7	DISTCLEANFILES = gconfsharp2-schemagen
6		8

Return to bug 221003

Lines 175-195 Link Here

(-)gnome-sharp-2.20.0/configure.in (-10 / +42 lines)
175	GNOME_REQUIRED_VERSION=2.20.0	175	GNOME_REQUIRED_VERSION=2.20.0
176	ART_REQUIRED_VERSION=2.3.19	176	ART_REQUIRED_VERSION=2.3.19
177		177
178	PKG_CHECK_MODULES(LIBART, libart-2.0 >= $ART_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)	178	AC_ARG_ENABLE(art,
179	AC_SUBST(LIBART_CFLAGS)	179	[ --disable-art Turn off art-sharp],
180	AC_SUBST(LIBART_LIBS)	180	[case "${enableval}" in
181		181	yes) enable_libart=yes ;;
182	PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOME_REQUIRED_VERSION, enable_gnomevfs=yes, enable_gnomevfs=no)	182	no) enable_libart=no ;;
183	AC_SUBST(GNOMEVFS_CFLAGS)	183	esac]
184	AC_SUBST(GNOMEVFS_LIBS)	184	,[enable_libart=yes])
		185
		186	if test "x$enable_libart" = "xyes"; then
		187	PKG_CHECK_MODULES(LIBART, libart-2.0 >= $ART_REQUIRED_VERSION, enable_libart=yes, enable_libart=no)
		188	AC_SUBST(LIBART_CFLAGS)
		189	AC_SUBST(LIBART_LIBS)
		190	fi
		191
		192	AC_ARG_ENABLE(gnomevfs,
		193	[ --disable-gnomevfs Turn off gnomevfs-sharp],
		194	[case "${enableval}" in
		195	yes) enable_gnomevfs=yes ;;
		196	no) enable_gnomevfs=no ;;
		197	esac]
		198	,[enable_gnomevfs=yes])
		199
		200	if test "x$enable_gnomevfs" = "xyes"; then
		201	PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOME_REQUIRED_VERSION, enable_gnomevfs=yes, enable_gnomevfs=no)
		202	AC_SUBST(GNOMEVFS_CFLAGS)
		203	AC_SUBST(GNOMEVFS_LIBS)
		204	fi
185		205
186	GNOMECANVAS_REQUIRED_VERSION=2.20.0	206	GNOMECANVAS_REQUIRED_VERSION=2.20.0
187	GNOMEPANEL_REQUIRED_VERSION=2.20.0	207	GNOMEPANEL_REQUIRED_VERSION=2.20.0
188	GNOMEPRINT_REQUIRED_VERSION=2.18.0	208	GNOMEPRINT_REQUIRED_VERSION=2.18.0
189		209
190	PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOMEPRINT_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION libpanelapplet-2.0 >= $GNOMEPANEL_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)	210	AC_ARG_ENABLE(gnome,
191	AC_SUBST(GNOME_CFLAGS)	211	[ --disable-gnome Turn off gnome-sharp],
192	AC_SUBST(GNOME_LIBS)	212	[case "${enableval}" in
		213	yes) enable_gnome=yes ;;
		214	no) enable_gnome=no ;;
		215	esac]
		216	,[enable_gnome=yes])
		217
		218	if test "x$enable_gnome" = "xyes"; then
		219	if test "x$enable_libart" = "xyes"; then
		220	PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOMEPRINT_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION libpanelapplet-2.0 >= $GNOMEPANEL_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no)
		221	AC_SUBST(GNOME_CFLAGS)
		222	AC_SUBST(GNOME_LIBS)
		223	fi
		224	fi
193		225
194	AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes")	226	AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes")
195	AM_CONDITIONAL(ENABLE_GNOMEVFS, test "x$enable_gnomevfs" = "xyes")	227	AM_CONDITIONAL(ENABLE_GNOMEVFS, test "x$enable_gnomevfs" = "xyes")