diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-04-15 12:00:06 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-04-15 19:01:24 +0000 |
| commit | 3f0bc55ed0e42919dfb05dbdb4d03e03d81ee4d1 (patch) | |
| tree | ba16ad25a6e87520672dc1e254b08b674b52e1c4 /configure.ac | |
| parent | 1279068c1dd8b48d8df9ef55a37d52115b493dca (diff) | |
Add license compatibility information for GMP (used by GnuTLS).
Update GLib and GTK+ release dates and add Qt release dates while we're
here.
Change-Id: Ia0da8f6e118e5737d19d321ce3fae6de75477b08
Reviewed-on: https://code.wireshark.org/review/1157
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e952b8c588..4b89d709d3 100644 --- a/configure.ac +++ b/configure.ac @@ -494,7 +494,10 @@ AC_ARG_WITH([gtk3], # GnuTLS # Version 3.0 switched from LGPLv2.1+ to LGPLv3+, then switched back to -# LGPLv2.1+ in version 3.1.10 +# LGPLv2.1+ in version 3.1.10. +# GnuTLS depends on GMP which switched from LGPLv2.1+ to LGPLv3+ in +# version 4.2.2, the switched to LGPLv3+ / GPLv2+ in version 6.0.0. + tls_message="no" AC_ARG_WITH([gnutls], AC_HELP_STRING( [--with-gnutls=@<:@yes/no@:>@], @@ -1335,6 +1338,7 @@ AC_SUBST(QT_MIN_VERSION) # force all programs to be built with GTK+ or Qt. # # Release dates for GTK+ versions: +# http://en.wikipedia.org/wiki/GTK+#Releases # 2.12.0: 14 Sep 2007 # 2.14.0: 04 Sep 2008 # 2.16.0: 13 Mar 2009 @@ -1347,6 +1351,17 @@ AC_SUBST(QT_MIN_VERSION) # 3.4.0: 26 Mar 2012 # 3.6.0: 24 Sep 2012 # 3.8.0: 25 Mar 2013 +# 3.10.0: 23 Sep 2013 +# 3.12.0: 25 Mar 2014 +# +# Release dates for Qt versions: +# http://en.wikipedia.org/wiki/List_of_Qt_releases +# 4.6.0: 01 Dec 2009 +# 4.7.0: 21 Sep 2010 +# 4.8.0: 15 Dec 2011 +# 5.0.0: 19 Dec 2012 +# 5.1.0: 03 Jul 2013 +# 5.2.0: 12 Dec 2013 have_qt=no have_gtk=no @@ -1456,6 +1471,8 @@ AC_SUBST(GLIB_MIN_VERSION) # 2.32.0: 24 Mar 2012 # 2.34.0: 24 Sep 2012 # 2.36.0: 25 Mar 2013 +# 2.38.0: 23 Sep 2013 +# 2.40.0: 24 Mar 2014 use_glib_cflags="true" if test "$have_gtk" = "yes" -a "$have_qt" = "yes" ; then |