Mercurial > hg > xemacs-beta
changeset 527:7b35ad872326
[xemacs-hg @ 2001-05-10 08:09:13 by yoshiki]
Malcolm Purvis's patch "[PATCH] Ximian an unsupported version of GTK?",
<m166frq0wn.fsf@co3018576-a.rivrw1.nsw.optushome.com.au>
* configure.in: Check gtk version validity only when gtk-config
exists.
| author | yoshiki |
|---|---|
| date | Thu, 10 May 2001 08:09:23 +0000 |
| parents | a5ee2ca8672c |
| children | ef4d2466a29c |
| files | ChangeLog configure configure.in |
| diffstat | 3 files changed, 23 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 09 17:18:32 2001 +0000 +++ b/ChangeLog Thu May 10 08:09:23 2001 +0000 @@ -1,3 +1,8 @@ +2001-04-26 Malcolm Purvis <malcolmpurvis@optushome.com.au> + + * configure.in: Check gtk version validity only when gtk-config + exists. + 2001-05-09 Martin Buchholz <martin@xemacs.org> * XEmacs 21.5.1 "anise" is released.
--- a/configure Wed May 09 17:18:32 2001 +0000 +++ b/configure Thu May 10 08:09:23 2001 +0000 @@ -5033,16 +5033,16 @@ possible_version=`${possible} --version 2> /dev/null` if test "x${possible_version}" != "x"; then GTK_CONFIG="${possible}" + case "${possible_version}" in + 1.0.*) echo "configure: warning: GTK 1.2 is required, please upgrade your version of GTK." 1>&2; with_gtk=no;; + 1.3.*) echo "configure: warning: GTK 1.3 is not supported right now" 1>&2; with_gtk=no;; + 1.2.*) + with_gtk=yes + break + ;; + *) echo "configure: warning: Found unsupported version of GTK: $possible_version" 1>&2;; + esac fi - case "${possible_version}" in - 1.0.*) echo "configure: warning: GTK 1.2 is required, please upgrade your version of GTK." 1>&2; with_gtk=no;; - 1.3.*) echo "configure: warning: GTK 1.3 is not supported right now" 1>&2; with_gtk=no;; - 1.2.*) - with_gtk=yes - break - ;; - *) echo "configure: warning: Found unsupported version of GTK: $possible_version" 1>&2;; - esac done echo "$ac_t""${GTK_CONFIG}" 1>&6 fi
--- a/configure.in Wed May 09 17:18:32 2001 +0000 +++ b/configure.in Thu May 10 08:09:23 2001 +0000 @@ -2548,16 +2548,16 @@ possible_version=`${possible} --version 2> /dev/null` if test "x${possible_version}" != "x"; then GTK_CONFIG="${possible}" + case "${possible_version}" in + 1.0.*) AC_MSG_WARN([GTK 1.2 is required, please upgrade your version of GTK.]); with_gtk=no;; + 1.3.*) AC_MSG_WARN([GTK 1.3 is not supported right now]); with_gtk=no;; + 1.2.*) + with_gtk=yes + break + ;; + *) AC_MSG_WARN([Found unsupported version of GTK: $possible_version]);; + esac fi - case "${possible_version}" in - 1.0.*) AC_MSG_WARN([GTK 1.2 is required, please upgrade your version of GTK.]); with_gtk=no;; - 1.3.*) AC_MSG_WARN([GTK 1.3 is not supported right now]); with_gtk=no;; - 1.2.*) - with_gtk=yes - break - ;; - *) AC_MSG_WARN([Found unsupported version of GTK: $possible_version]);; - esac done AC_MSG_RESULT([${GTK_CONFIG}]) fi