diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2007-03-01 09:50:38 +0000 |
|---|---|---|
| committer | Chris Wilson <cpwilson@src.gnome.org> | 2007-03-01 09:50:38 +0000 |
| commit | fb8c66adab006dc51567dc043ad4d3a9471872a3 (patch) | |
| tree | db216e6c66f49946999353e36050664c0d8f9458 | |
| parent | e76f76be61f5c533e54c0820361765437ef75b8e (diff) | |
| download | vte-fb8c66adab006dc51567dc043ad4d3a9471872a3.tar.gz | |
Fix X11 headers / libraries detection on bi-arch systems. Patch by
2007-03-01 Chris Wilson <chris@chris-wilson.co.uk>
Fix X11 headers / libraries detection on bi-arch systems.
Patch by Frederic Crozat.
* configure.in:
Check for x_includes before ac_x_includes, and similary for
ac_x_libraries.
svn path=/trunk/; revision=1788
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 14 insertions, 1 deletions
@@ -1,5 +1,14 @@ 2007-03-01 Chris Wilson <chris@chris-wilson.co.uk> + Fix X11 headers / libraries detection on bi-arch systems. + Patch by Frederic Crozat. + + * configure.in: + Check for x_includes before ac_x_includes, and similary for + ac_x_libraries. + +2007-03-01 Chris Wilson <chris@chris-wilson.co.uk> + Bug 410534 – Slow content scrolling, takes 100% of CPU. * src/vtexft.c: diff --git a/configure.in b/configure.in index 22b22685..cff9d17f 100644 --- a/configure.in +++ b/configure.in @@ -185,11 +185,15 @@ fi # the list of libraries for grins. AC_PATH_XTRA([X11], [X11/Xlib.h], [XFlush(NULL)]) if test "$have_x" = yes ; then - if test -d "$ac_x_includes" ; then + if test -d "$x_includes" ; then + X_CFLAGS="-I$x_includes $X_CFLAGS" + elif test -d "$ac_x_includes" ; then X_CFLAGS="-I$ac_x_includes $X_CFLAGS" fi X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" if test -d "$ac_x_libraries" ; then + X_LIBS="-L$x_libraries $X_LIBS" + elif test -d "$ac_x_libraries" ; then X_LIBS="-L$ac_x_libraries $X_LIBS" fi fi |