diff --git a/configure.ac b/configure.ac index d8a7fe90..e8381605 100644 --- a/configure.ac +++ b/configure.ac @@ -174,17 +174,18 @@ dnl dnl IMLIB2 dnl -AC_ARG_ENABLE([imlib2], - AC_HELP_STRING([--enable-imlib2], [enable if you want Imlib2 support [[default=no]]]), - [want_imlib2="$enableval"], [want_imlib2=no]) - -AM_CONDITIONAL(BUILD_IMLIB2, test x$want_imlib2 = xyes) -if test x$want_imlib2 = xyes; then - PKG_CHECK_MODULES([Imlib2], [imlib2]) - CFLAGS="$CFLAGS $Imlib2_CFLAGS" - LIBS="$LIBS $Imlib2_LIBS" - AC_DEFINE(IMLIB2, 1, [Define if you want Imlib2 support]) -fi +dnl --commented out until brenden finishes it -- +dnl AC_ARG_ENABLE([imlib2], +dnl AC_HELP_STRING([--enable-imlib2], [enable if you want Imlib2 support [[default=no]]]), +dnl [want_imlib2="$enableval"], [want_imlib2=no]) +dnl +dnl AM_CONDITIONAL(BUILD_IMLIB2, test x$want_imlib2 = xyes) +dnl if test x$want_imlib2 = xyes; then +dnl PKG_CHECK_MODULES([Imlib2], [imlib2]) +dnl CFLAGS="$CFLAGS $Imlib2_CFLAGS" +dnl LIBS="$LIBS $Imlib2_LIBS" +dnl AC_DEFINE(IMLIB2, 1, [Define if you want Imlib2 support]) +dnl fi dnl dnl PORT_MONITORS diff --git a/src/conky.c b/src/conky.c index 2d6db989..ed447761 100644 --- a/src/conky.c +++ b/src/conky.c @@ -6922,11 +6922,6 @@ int main(int argc, char **argv) update_text_area(); /* to position text/window on screen */ #endif /* X11 */ -/*#ifdef CAIRO -// why the fuck not? -//do_it(); -#endif*/ - #ifdef X11 #ifdef OWN_WINDOW if (own_window && !fixed_pos) {