--- rxvt-unicode/configure.ac 2012/06/19 20:50:05 1.145 +++ rxvt-unicode/configure.ac 2012/06/29 19:36:11 1.146 @@ -423,6 +423,33 @@ AC_PATH_XTRA +image_lib=none + +PIXBUF_CFLAGS= +PIXBUF_LIBS= + +if test x$support_pixbuf = xyes; then + support_pixbuf=no + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + AC_MSG_CHECKING(for gdk-pixbuf) + if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then + PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" + PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" + support_pixbuf=yes + fi + + if test x$support_pixbuf = xyes; then + AC_MSG_RESULT(ok) + image_lib=gdk-pixbuf + AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) + else + AC_MSG_RESULT(no) + fi +fi + +AC_SUBST(PIXBUF_CFLAGS) +AC_SUBST(PIXBUF_LIBS) + STARTUP_NOTIFICATION_CFLAGS= STARTUP_NOTIFICATION_LIBS= @@ -611,11 +638,6 @@ fi fi -image_lib=none - -PIXBUF_CFLAGS= -PIXBUF_LIBS= - if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then LIBS="$LIBS -lm" AC_DEFINE(XRENDER, 1, Define to enable xrender support) @@ -625,29 +647,10 @@ fi if test x$support_pixbuf = xyes; then - support_pixbuf=no - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - AC_MSG_CHECKING(for gdk-pixbuf) - if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then - PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" - PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" - support_pixbuf=yes - fi - - if test x$support_pixbuf = xyes; then - AC_MSG_RESULT(ok) - image_lib=gdk-pixbuf - AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) - AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) - else - AC_MSG_RESULT(no) - fi + AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) fi fi -AC_SUBST(PIXBUF_CFLAGS) -AC_SUBST(PIXBUF_LIBS) - if test x$support_styles = xyes; then AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) fi