diff options
| author | Dmitry Antipov | 2012-07-17 11:30:25 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-07-17 11:30:25 +0400 |
| commit | 441efe9fdd79cfbfc2122054e1be52f0006b9f53 (patch) | |
| tree | 87e4df0f08c5fad0e3899e6bf602daaaa878e8d0 | |
| parent | 3900d5de1b3cbb4171db39b5a187b623a7393087 (diff) | |
| download | emacs-441efe9fdd79cfbfc2122054e1be52f0006b9f53.tar.gz emacs-441efe9fdd79cfbfc2122054e1be52f0006b9f53.zip | |
Fix toolkit configuration report.
* configure.ac (USE_X_TOOLKIT): Report toolkit as GTK3 if
--with-x-toolkit=gtk3 is used.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 11 insertions, 1 deletions
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-07-17 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | Fix toolkit configuration report. | ||
| 4 | * configure.ac (USE_X_TOOLKIT): Report toolkit as GTK3 if | ||
| 5 | --with-x-toolkit=gtk3 is used. | ||
| 6 | |||
| 1 | 2012-07-17 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2012-07-17 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | Fix regression with pthread_sigmask on FreeBSD (Bug#11884). | 9 | Fix regression with pthread_sigmask on FreeBSD (Bug#11884). |
diff --git a/configure.ac b/configure.ac index 12869e14e77..fba98513825 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -4298,7 +4298,11 @@ End: | |||
| 4298 | #### It makes printing result more understandable as using GTK sets | 4298 | #### It makes printing result more understandable as using GTK sets |
| 4299 | #### toolkit_scroll_bars to yes by default. | 4299 | #### toolkit_scroll_bars to yes by default. |
| 4300 | if test "${HAVE_GTK}" = "yes"; then | 4300 | if test "${HAVE_GTK}" = "yes"; then |
| 4301 | USE_X_TOOLKIT=GTK | 4301 | if test "${with_gtk3}" = "yes"; then |
| 4302 | USE_X_TOOLKIT=GTK3 | ||
| 4303 | else | ||
| 4304 | USE_X_TOOLKIT=GTK | ||
| 4305 | fi | ||
| 4302 | fi | 4306 | fi |
| 4303 | 4307 | ||
| 4304 | echo " | 4308 | echo " |