diff options
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | configure.ac | 5 |
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 |