aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-23 02:22:54 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-04-23 09:38:21 -0300
commit11c8afc8fc3998668a09147c0c025cd4f348e7ae (patch)
tree393d1f2d3fac4f8398ad1cd370ee8ae6666ba2f3
parent98eb0a94851045a1f0b7f49613d462926166019d (diff)
Fix compilation with Xorg
Instead of using the old XFree86 directory assumptions, work with the new Xorg way of putting the libraries at the standard /usr/lib, and having the includes at /usr/include/X11. With this, there's no need for an special parameter at configure to point to X11 libraries (as they'll be find at /usr/lib). Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Makefile.in6
-rw-r--r--configure.ac5
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 389a39c..3355496 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,11 +29,11 @@ VERSION := @VERSION@
# for CFLAGS
WARN_FLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
+X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/include/X11/fonts
LIB_FLAGS := -I. -I./vbistuff -I./x11 \
-I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
-I$(srcdir)/x11 -I$(srcdir)/structs \
- -I$(srcdir)/libng -Llibng
+ -I$(srcdir)/libng -Llibng -LlibFS
# various libraries
ATHENA_LIBS := @X_LIBS@ @XFT_LIBS@ @LIBS@ @ATHENA@
@@ -49,7 +49,7 @@ QT_LIBS := @QTLIBS@
VBI_LIBS := @LIBZVBI@
GL_LIBS := @LIBGL@
DV_LIBS := @LIBDV@
-FS_LIBS := -L@x_libraries@ @FSLIB@
+FS_LIBS := @FSLIB@
DLFLAGS := @DLFLAGS@
# stuff configure has found
diff --git a/configure.ac b/configure.ac
index db68671..4bbddad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,6 @@ AC_SUBST(X_PRE_LIBS)
AC_SUBST(X_EXTRA_LIBS)
AC_SUBST(X_LIBS)
AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
AC_SUBST(ATHENA)
AC_SUBST(FSLIB)
AC_SUBST(SUBS)
@@ -293,7 +292,7 @@ AC_SUBST(VERSION)
dnl ---------------------------------------------------------------------
AC_MSG_CHECKING(for X11 config directory)
-x11conf=/usr/X11R6/lib/X11
+x11conf=/usr/lib/X11
if test -d /etc/X11; then
x11conf=/etc/X11
fi
@@ -301,7 +300,7 @@ AC_MSG_RESULT($x11conf)
AC_SUBST(x11conf)
AC_MSG_CHECKING(for X11 app-defaults directory)
-resdir=/usr/X11R6/lib/X11
+resdir=/usr/lib/X11
if test -d /etc/X11/app-defaults; then
resdir=/etc/X11
fi

Privacy Policy