diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 8cc98a01..fdcaac53 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -31,6 +31,7 @@ AC_PROG_AWK | |||
31 | AM_PROG_CC_C_O | 31 | AM_PROG_CC_C_O |
32 | AC_PROG_MKDIR_P | 32 | AC_PROG_MKDIR_P |
33 | AC_PROG_CPP | 33 | AC_PROG_CPP |
34 | AC_PROG_CC_C99 | ||
34 | AC_PROG_INSTALL | 35 | AC_PROG_INSTALL |
35 | AC_PROG_LN_S | 36 | AC_PROG_LN_S |
36 | AC_PROG_MAKE_SET | 37 | AC_PROG_MAKE_SET |
@@ -242,7 +243,7 @@ AC_SUBST(QR_LIBS) | |||
242 | 243 | ||
243 | AC_MSG_CHECKING(for gtk) | 244 | AC_MSG_CHECKING(for gtk) |
244 | without_gtk=true | 245 | without_gtk=true |
245 | AM_PATH_GTK_3_0([3.0.0],without_gtk=false,) | 246 | PKG_CHECK_MODULES([GTK], [gtk+-3.0]) |
246 | 247 | ||
247 | # test for libunique | 248 | # test for libunique |
248 | AC_ARG_WITH([libunique], AC_HELP_STRING([--without-libunique], [disable libunique])) | 249 | AC_ARG_WITH([libunique], AC_HELP_STRING([--without-libunique], [disable libunique])) |
@@ -251,13 +252,6 @@ if test x$with_libunique != xno; then | |||
251 | PKG_CHECK_MODULES([unique], [unique-3.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, [Define if libunique is available]), AC_MSG_WARN([libunique would be nice to have])) | 252 | PKG_CHECK_MODULES([unique], [unique-3.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, [Define if libunique is available]), AC_MSG_WARN([libunique would be nice to have])) |
252 | fi | 253 | fi |
253 | 254 | ||
254 | AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue) | ||
255 | if test $without_gtk != true | ||
256 | then | ||
257 | AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK]) | ||
258 | else | ||
259 | AC_MSG_ERROR(Cannot find GTK: Is pkg-config in path?) | ||
260 | fi | ||
261 | CFLAGS="$CFLAGS $GTK_CFLAGS" | 255 | CFLAGS="$CFLAGS $GTK_CFLAGS" |
262 | CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" | 256 | CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" |
263 | LIBS="$LIBS $GTK_LIBS" | 257 | LIBS="$LIBS $GTK_LIBS" |