diff options
| author | TingPing <tingping@tingping.se> | 2015-03-01 08:42:26 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2015-03-01 08:47:35 -0500 |
| commit | 658f30ec43c654fea8cd5e60fa7736791648e5c8 (patch) | |
| tree | fd85e0899609e9162d4f211cba53f68327ca6409 | |
| parent | 749e5b20da486955a54c7be79d9481d465d1d5bd (diff) | |
configure: Don't depend on gtk-2.0.m4
It doesn't really add much value and it is possible to build fetext without gtk installed
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index ea7f16e4..6a8b7945 100644 --- a/configure.ac +++ b/configure.ac @@ -190,21 +190,15 @@ dnl ********************************************************************* dnl ** GTK ************************************************************** dnl ********************************************************************* -# we might get undefined macro without this test if test "$gtkfe" = yes ; then - AM_PATH_GTK_2_0(2.24.0, havegtk=yes, havegtk=no) - - if test "$havegtk" = no; then + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.24.0], [ + GUI_LIBS="$GUI_LIBS $GTK_LIBS" + GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED" + ], [ gtkfe=no - echo - echo Cannot find GTK\! Not building GTK FrontEnd. - echo - fi + ]) fi -GUI_LIBS="$GUI_LIBS $GTK_LIBS" -GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED" - dnl ********************************************************************* dnl ** MAC_INTEGRATION ************************************************** dnl ********************************************************************* |