procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.

Browse source
This commit is contained in:
Jan Djärv 2012-09-18 20:13:01 +02:00
parent ae97707fa2
commit 5fb91e7197
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-09-18 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
2012-09-17 Andreas Schwab <schwab@linux-m68k.org>
* Makefile.in (bootstrap): Revert last change. Run config.status

4
configure.ac
View file

@ -1914,6 +1914,7 @@ if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOO
AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.])
GTK_OBJ=emacsgtkfixed.o
term_header=gtkutil.h
USE_GTK_TOOLKIT="GTK3"
else
check_gtk2=yes
gtk3_pkg_errors="$GTK_PKG_ERRORS "
@ -1932,6 +1933,7 @@ if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then
then
AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS)
fi
test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2"
fi
if test x"$pkg_check_gtk" = xyes; then
@ -4396,7 +4398,7 @@ End:
#### It makes printing result more understandable as using GTK sets
#### toolkit_scroll_bars to yes by default.
if test "${HAVE_GTK}" = "yes"; then
USE_X_TOOLKIT=GTK
USE_X_TOOLKIT="$USE_GTK_TOOLKIT"
fi
echo "