summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Woelders <kim@woelders.dk>2011-04-15 22:04:59 +0000
committerKim Woelders <kim@woelders.dk>2011-04-15 22:04:59 +0000
commitebb62b7521bfbe3c2fda289c972e18cfdce940cc (patch)
tree6897caefe3d90b1586fbaafb9f9868ff60d78f9e
parent8169598a08d4af94db33c0fee7c50611c1d84651 (diff)
downloadimlib2-ebb62b7521bfbe3c2fda289c972e18cfdce940cc.tar.gz
Avoid referencing /usr/X11R6 when x_dir is not set.
... which normally it will not be, AFAICT. SVN revision: 58696
-rw-r--r--configure.ac5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 3c221c5..0c85b43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,9 +126,8 @@ fi
if test "x$have_x" = "xyes"; then
AC_PATH_XTRA
- x_dir=${x_dir:-/usr/X11R6}
- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+ x_cflags=$X_CFLAGS
+ x_libs=$X_LIBS" -lX11 -lXext"
AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
else
x_cflags=""