Mercurial > hg > release > icedtea-web-1.3
changeset 469:55911b39b5c0
Introduced configure option --with-gtk=2|3|default to be able
to compile against different version of GTK+ (2.x or 3.x).
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Tue, 31 Jul 2012 14:38:12 +0200 |
| parents | 14fbe4fcec25 |
| children | 3b9b763bf1fc |
| files | AUTHORS ChangeLog NEWS acinclude.m4 |
| diffstat | 4 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Tue Jul 24 10:35:11 2012 -0400 +++ b/AUTHORS Tue Jul 31 14:38:12 2012 +0200 @@ -8,6 +8,7 @@ Adam Domurad <adomurad@redhat.com> Thomas Fitzsimmons <fitzsim@redhat.com> Mark Greenwood <mark@dcs.shef.ac.uk> +Peter Hatina <phatina@redhat.com> Andrew John Hughes <ahughes@redhat.com> Matthias Klose <doko@ubuntu.com> Michał Górny < mgorny@gentoo.org >
--- a/ChangeLog Tue Jul 24 10:35:11 2012 -0400 +++ b/ChangeLog Tue Jul 31 14:38:12 2012 +0200 @@ -1,3 +1,12 @@ +2012-07-31 Jiri Vanek <jvanek@redhat.com> + Peter Hatina <phatina@redhat.com> + + Introduced configure option --with-gtk=2|3|default to be able + to compile against different version of GTK+ (2.x or 3.x). + * NEWS: mentioned bug fix + * acinclude.m4: (ITW_GTK_CHECK_VERSION) macro for getting GTK+ version + (ITW_GTK_CHECK) macro for checking GTK+ version + 2012-07-24 Adam Domurad <adomurad@redhat.com> * plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/NEWS Tue Jul 24 10:35:11 2012 -0400 +++ b/NEWS Tue Jul 31 14:38:12 2012 +0200 @@ -25,6 +25,7 @@ - PR918: java applet windows uses a low resulution black/white icon - RH838417: Disambiguate signed applet security prompt from certificate warning - RH838559: Disambiguate signed applet security prompt from certificate warning + - RH720836: project can be compiled against GTK+ 2 or 3 librarie New in release 1.2 (2011-XX-XX): * Security updates:
--- a/acinclude.m4 Tue Jul 24 10:35:11 2012 -0400 +++ b/acinclude.m4 Tue Jul 31 14:38:12 2012 +0200 @@ -359,13 +359,51 @@ AC_MSG_RESULT(${enable_plugin}) ]) +dnl ITW_GTK_CHECK_VERSION([gtk version]) +AC_DEFUN([ITW_GTK_CHECK_VERSION], +[ + AC_MSG_CHECKING([for GTK$1 version]) + GTK_VER=`$PKG_CONFIG --modversion gtk+-$1.0` + AC_MSG_RESULT([$GTK_VER]) +]) + +dnl ITW_GTK_CHECK([gtk version]) +AC_DEFUN([ITW_GTK_CHECK], +[ + case "$1" in + default) + PKG_CHECK_MODULES(GTK, gtk+-3.0, + [ITW_GTK_CHECK_VERSION([3])], + [PKG_CHECK_MODULES(GTK, gtk+-2.0, + [ITW_GTK_CHECK_VERSION([2])], + [AC_MSG_ERROR([GTK $1 not found])] + )] + ) + ;; + *) + PKG_CHECK_MODULES(GTK, gtk+-$1.0, + [ITW_GTK_CHECK_VERSION([$1])], + [AC_MSG_ERROR([GTK $1 not found])] + ) + ;; + esac +]) + AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES], [ dnl Check for plugin support headers and libraries. dnl FIXME: use unstable AC_REQUIRE([IT_CHECK_PLUGIN]) if test "x${enable_plugin}" = "xyes" ; then - PKG_CHECK_MODULES(GTK, gtk+-2.0) + AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=[2|3|default]], + [the GTK+ version to use (default: 3)])], + [case "$with_gtk" in + 2|3|default) ;; + *) AC_MSG_ERROR([invalid GTK version specified]) ;; + esac], + [with_gtk=default]) + ITW_GTK_CHECK([$with_gtk]) PKG_CHECK_MODULES(GLIB, glib-2.0) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS)