[xlibs-commit] X11 configure.ac,1.19,1.20
Jim Gettys
xlibs-commit@pdx.freedesktop.org
Wed, 12 Nov 2003 13:47:42 -0800
Committed by: jg
Update of /cvs/xlibs/X11
In directory pdx:/tmp/cvs-serv6504/X11
Modified Files:
configure.ac
Log Message:
Patch submitted by mikelima@virgilio.it (Luciano Montanaro) to fix:
http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=139
There is a README that says that when using pkg-config, the
AC_SUBST(packagename_CFLAGS)
AC_SUBST(packagename_LIBS)
lines should be supplied in the configure.in
Index: configure.ac
===================================================================
RCS file: /cvs/xlibs/X11/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- configure.ac 10 Nov 2003 05:31:59 -0000 1.19
+++ configure.ac 12 Nov 2003 21:47:40 -0000 1.20
@@ -21,8 +21,16 @@
# Checks for pkg-config packages
PKG_CHECK_MODULES(XPROTO, xproto)
+AC_SUBST(XPROTO_CFLAGS)
+AC_SUBST(XPROTO_LIBS)
+
PKG_CHECK_MODULES(X11, xextensions xtrans xau)
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
+
PKG_CHECK_MODULES(XDMCP, xdmcp, [xdmauth="yes"], [xdmauth="no"])
+AC_SUBST(XDMCP_CFLAGS)
+AC_SUBST(XDMCP_LIBS)
# Check for dlopen
AC_SEARCH_LIBS(dlopen,[dl svld])
@@ -168,7 +176,6 @@
X11_DATADIR='${datadir}/X11'
AC_SUBST(X11_DATADIR)
-AC_SUBST(X11_CFLAGS)
AC_OUTPUT([Makefile
include/Makefile