Mon, 01 Oct 2007 17:48:13 +0000
merge of '4d3a417f3d028dfc35faf34b678dbe93327a72d8'
and 'afc03cb3158d100964055c5cceff8dc627d9641f'
| configure.ac | file | annotate | diff | comparison | revisions | |
| libpurple/protocols/jabber/.todo | file | annotate | diff | comparison | revisions | |
| libpurple/protocols/oscar/.todo | file | annotate | diff | comparison | revisions | |
| po/sr@Latn.po | file | annotate | diff | comparison | revisions |
--- a/configure.ac Mon Oct 01 17:47:45 2007 +0000 +++ b/configure.ac Mon Oct 01 17:48:13 2007 +0000 @@ -352,19 +352,13 @@ dnl ####################################################################### if test "x$with_x" = "xyes" ; then PKG_CHECK_MODULES(X11, x11, - [AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11])], + [AC_DEFINE(HAVE_X, 1, [Define to 1 if you have X11])], [AC_MSG_RESULT(no) - if test "x$x_incpath_add" != "x" -a "x$x_libpath_add" != "x"; then - X11_LIBS="$x_libpath_add" - X11_CFLAGS="$x_incpath_add" - else - with_x=no - fi - ]) + with_x=no]) AC_SUBST(X11_LIBS) AC_SUBST(X11_CFLAGS) fi - + dnl ####################################################################### dnl # Check for XScreenSaver dnl #######################################################################