[aisleriot] Remove obsolete feature check
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [aisleriot] Remove obsolete feature check
- Date: Tue, 12 Apr 2011 16:50:27 +0000 (UTC)
commit 763a3d5caa0eaeb62d11cb369f2fedc95a4e801b
Author: Christian Persch <chpe gnome org>
Date: Tue Apr 12 18:48:13 2011 +0200
Remove obsolete feature check
configure.ac | 8 --------
src/lib/Makefile.am | 4 ++--
2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 749e996..eb5eb06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -452,14 +452,6 @@ AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
-# glib-genmarshal --internal only exists since 2.14
-if $PKG_CONFIG --exists "glib-2.0 >= 2.14.0" ; then
- GLIB_GENMARSHAL_INTERNAL="--internal"
-else
- GLIB_GENMARSHAL_INTERNAL=
-fi
-AC_SUBST([GLIB_GENMARSHAL_INTERNAL])
-
if test "$platform_win32" = "yes" -a "$os_win32" = "yes"; then
AC_CHECK_TOOL([WINDRES],[windres],[no])
if test "$WINDRES" = "no"; then
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index d6bdc00..e5e500c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -122,13 +122,13 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.gschema.xml.in=.gschema.xml)
ar-marshal.c: stamp-ar-marshal.c
@true
stamp-ar-marshal.c: ar-marshal.list Makefile
- $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ar_marshal $< --header --body $(GLIB_GENMARSHAL_INTERNAL) > ar-marshal.c \
+ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ar_marshal $< --header --body --internal > ar-marshal.c \
&& echo timestamp > $(@F)
ar-marshal.h: stamp-ar-marshal.h
@true
stamp-ar-marshal.h: ar-marshal.list Makefile
- $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ar_marshal $< --header $(GLIB_GENMARSHAL_INTERNAL) > ar-marshal.h \
+ $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=ar_marshal $< --header --internal > ar-marshal.h \
&& echo timestamp > $(@F)
# Auxiliary programme to prerender card images
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]