Mercurial > pidgin.yaz
changeset 20035:3bd61d44f8be
Hopefully fix the broken detection of X11 stuffs on older X installations
that don't have an x11.pc pkgconfig file
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 14 Sep 2007 15:34:59 +0000 |
| parents | f41b96686cfb |
| children | 2dc6f3ab2ab3 |
| files | configure.ac |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Fri Sep 14 15:34:03 2007 +0000 +++ b/configure.ac Fri Sep 14 15:34:59 2007 +0000 @@ -352,13 +352,19 @@ dnl ####################################################################### if test "x$with_x" = "xyes" ; then PKG_CHECK_MODULES(X11, x11, - [AC_DEFINE(HAVE_X, 1, [Define to 1 if you have X11])], + [AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11])], [AC_MSG_RESULT(no) - with_x=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 + ]) AC_SUBST(X11_LIBS) AC_SUBST(X11_CFLAGS) fi - + dnl ####################################################################### dnl # Check for XScreenSaver dnl #######################################################################