diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 69d1a1e5bd3..b38aa976259 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -229,7 +229,7 @@ AC_ARG_ENABLE(maintainer-mode, | |||
| 229 | [enable make rules and dependencies not useful (and sometimes | 229 | [enable make rules and dependencies not useful (and sometimes |
| 230 | confusing) to the casual installer])], | 230 | confusing) to the casual installer])], |
| 231 | USE_MAINTAINER_MODE=$enableval, | 231 | USE_MAINTAINER_MODE=$enableval, |
| 232 | USE_MAINTAINER_MODE=no) | 232 | USE_MAINTAINER_MODE=yes) |
| 233 | if test $USE_MAINTAINER_MODE = yes; then | 233 | if test $USE_MAINTAINER_MODE = yes; then |
| 234 | MAINT= | 234 | MAINT= |
| 235 | else | 235 | else |
| @@ -1826,8 +1826,8 @@ fi | |||
| 1826 | 1826 | ||
| 1827 | HAVE_GTK=no | 1827 | HAVE_GTK=no |
| 1828 | if test "${with_gtk3}" = "yes"; then | 1828 | if test "${with_gtk3}" = "yes"; then |
| 1829 | GLIB_REQUIRED=2.6 | 1829 | GLIB_REQUIRED=2.28 |
| 1830 | GTK_REQUIRED=2.90 | 1830 | GTK_REQUIRED=3.0 |
| 1831 | GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" | 1831 | GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" |
| 1832 | 1832 | ||
| 1833 | dnl Checks for libraries. | 1833 | dnl Checks for libraries. |
| @@ -1835,6 +1835,7 @@ if test "${with_gtk3}" = "yes"; then | |||
| 1835 | if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then | 1835 | if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then |
| 1836 | AC_MSG_ERROR($GTK_PKG_ERRORS) | 1836 | AC_MSG_ERROR($GTK_PKG_ERRORS) |
| 1837 | fi | 1837 | fi |
| 1838 | AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.]) | ||
| 1838 | fi | 1839 | fi |
| 1839 | 1840 | ||
| 1840 | if test "$pkg_check_gtk" != "yes"; then | 1841 | if test "$pkg_check_gtk" != "yes"; then |
| @@ -2256,7 +2257,7 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 2256 | dnl if -lfreetype is not specified. | 2257 | dnl if -lfreetype is not specified. |
| 2257 | dnl The following is needed to set FREETYPE_LIBS. | 2258 | dnl The following is needed to set FREETYPE_LIBS. |
| 2258 | PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, | 2259 | PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, |
| 2259 | HAVE_FREETYPE=no) | 2260 | HAVE_FREETYPE=no) |
| 2260 | 2261 | ||
| 2261 | test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype) | 2262 | test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype) |
| 2262 | fi | 2263 | fi |