diff -Nur xchat-gnome-0.11.orig/configure.ac xchat-gnome-0.11/configure.ac --- xchat-gnome-0.11.orig/configure.ac 2006-04-05 18:16:47.000000000 +0000 +++ xchat-gnome-0.11/configure.ac 2006-04-17 19:28:12.502578000 +0000 @@ -110,24 +110,40 @@ AM_CONDITIONAL([ENABLE_DBUS],[test "x$dbus" = "xyes"]) +AC_ARG_ENABLE([libsexy], + AS_HELP_STRING([--enable-libsexy],[Enable libsexy support]), + [enable_libsexy=$enableval libsexy=$enableval], + [enable_libsexy=no libsexy=no]) + # libsexy soft dependency -PKG_CHECK_MODULES([LIBSEXY], [libsexy >= $LIBSEXY_REQUIRED], libsexy=yes, libsexy=no) -AC_SUBST([LIBSEXY_CFLAGS]) -AC_SUBST([LIBSEXY_LIBS]) +if test "x$enable_libsexy" = "xyes"; then + PKG_CHECK_MODULES([LIBSEXY], [libsexy >= $LIBSEXY_REQUIRED], libsexy=yes, libsexy=no) + AC_DEFINE(HAVE_LIBSEXY, 1, [Enable libsexy]) + AC_SUBST([LIBSEXY_CFLAGS]) + AC_SUBST([LIBSEXY_LIBS]) +fi + AM_CONDITIONAL([ENABLE_LIBSEXY],[test "x$libsexy" = "xyes"]) -if test "x$libsexy" = "xyes"; then - AC_DEFINE(HAVE_LIBSEXY, 1, [Enable libsexy]) -else - AC_MSG_WARN([Library requirements (libsexy >= $LIBSEXY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]) + +if test "x$enable_libsexy" = "xyes" && test "x$libsexy" != "xyes"; then + AC_MSG_ERROR([libsexy not found]) fi +AC_ARG_ENABLE([libnotify], + AS_HELP_STRING([--enable-libnotify],[Enable libnotify support]), + [enable_libnotify=$enableval libnotify=$enableval], + [enable_libnotify=no libnotify=no]) + # libnotify soft dependency -PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no) -AC_SUBST([LIBNOTIFY_CFLAGS]) -AC_SUBST([LIBNOTIFY_LIBS]) +if test "x$enable_libnotify" = "xyes"; then + PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no) + AC_SUBST([LIBNOTIFY_CFLAGS]) + AC_SUBST([LIBNOTIFY_LIBS]) +fi + AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$libnotify" = "xyes"]) -if test "x$libnotify" != "xyes"; then - AC_MSG_WARN([Library requirements (libnotify >= $LIBNOTIFY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]) +if test "x$enable_libnotify" = "xyes" && test "x$libnotify" != "xyes"; then + AC_MSG_ERROR([libnotify not found]) fi # GConf