[vte] Don't force VTE_SEAL_ENABLE on vte/gtk2
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] Don't force VTE_SEAL_ENABLE on vte/gtk2
- Date: Tue, 14 Sep 2010 22:49:12 +0000 (UTC)
commit e984749f939981d16ee7828ebef352e74ce461e1
Author: Christian Persch <chpe gnome org>
Date: Wed Sep 15 00:47:58 2010 +0200
Don't force VTE_SEAL_ENABLE on vte/gtk2
Only enforce it on vte 2.90 (gtk3).
configure.in | 3 +++
vte-uninstalled.pc.in | 2 +-
vte.pc.in | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 56e16c7..3b24093 100644
--- a/configure.in
+++ b/configure.in
@@ -50,6 +50,7 @@ case "$with_gtk" in
VTE_API_MINOR_VERSION=0
VTE_PC_VERSION=
VTE_LIBRARY_SUFFIX=
+ VTE_SEAL_CFLAGS=
GTK_API_VERSION=2.0
GTK_REQUIRED=2.20.0
;;
@@ -58,6 +59,7 @@ case "$with_gtk" in
VTE_API_MINOR_VERSION=90
VTE_PC_VERSION=-$VTE_API_VERSION
VTE_LIBRARY_SUFFIX=$VTE_API_VERSION
+ VTE_SEAL_CFLAGS="-DVTE_SEAL_ENABLE"
GTK_API_VERSION=3.0
GTK_REQUIRED=2.90.0
;;
@@ -68,6 +70,7 @@ AC_SUBST([VTE_API_VERSION_U],[AS_TR_SH([$VTE_API_VERSION])])
AC_SUBST([VTE_API_MAJOR_VERSION])
AC_SUBST([VTE_API_MINOR_VERSION])
AC_SUBST([VTE_PC_VERSION])
+AC_SUBST([VTE_SEAL_CFLAGS])
AC_SUBST([GTK_API_VERSION])
AC_SUBST([VTE_LIBRARY_SUFFIX_U],[AS_TR_SH([$VTE_LIBRARY_SUFFIX])])
diff --git a/vte-uninstalled.pc.in b/vte-uninstalled.pc.in
index 2e37018..36ee26b 100644
--- a/vte-uninstalled.pc.in
+++ b/vte-uninstalled.pc.in
@@ -10,4 +10,4 @@ Description: Vte terminal widget.
Version: @VERSION@
Requires: @VTE_PKGS@
Libs: ${pc_top_builddir}/${pcfiledir}/src/libvte VTE_LIBRARY_SUFFIX_U@.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}/src
+Cflags: -I${pc_top_builddir}/${pcfiledir}/src @VTE_SEAL_CFLAGS@
diff --git a/vte.pc.in b/vte.pc.in
index da45192..672171a 100644
--- a/vte.pc.in
+++ b/vte.pc.in
@@ -10,4 +10,4 @@ Description: Vte terminal widget.
Version: @VERSION@
Requires: @VTE_PKGS@
Libs: -L${libdir} -lvte VTE_LIBRARY_SUFFIX_U@
-Cflags: -I${includedir}/vte- VTE_API_VERSION@ -DVTE_SEAL_ENABLE
+Cflags: -I${includedir}/vte- VTE_API_VERSION@ @VTE_SEAL_CFLAGS@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]