diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | x11.pc.in | 2 |
3 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2005-09-21 Alan Coopersmith <alan.coopersmith@sun.com> + + * x11.pc.in: + * configure.ac: + Add XTHREAD_CFLAGS for platforms that need special defines like + -D_REENTRANT or -D_POSIX_whatever to get re-entrant function + definitions. + Set XDMCP_LIBS correctly for later libXdmcp tests. + 2005-09-01 Kristian Høgsberg <krh@redhat.com> * nls/C/Makefile.am: diff --git a/configure.ac b/configure.ac index 47b7adb2..5e3061d1 100644 --- a/configure.ac +++ b/configure.ac @@ -29,10 +29,12 @@ PKG_CHECK_MODULES(XPROTO, xproto) AC_SUBST(XPROTO_LIBS) AC_SUBST(XPROTO_CFLAGS) -PKG_CHECK_MODULES(X11, xextproto xtrans xau xcmiscproto xdmcp) +PKG_CHECK_MODULES(X11, xextproto xtrans xau xcmiscproto) AC_SUBST(X11_CFLAGS) AC_SUBST(X11_LIBS) + +PKG_CHECK_MODULES(XDMCP, xdmcp) AC_SUBST(XDMCP_CFLAGS) AC_SUBST(XDMCP_LIBS) @@ -161,9 +163,13 @@ if test x$xthreads == xyes ; then case $host_os in linux*|openbsd*) XTHREADLIB=-lpthread ;; + solaris*) + XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;; esac fi AC_SUBST(XTHREADLIB) +AC_SUBST(XTHREAD_CFLAGS) +X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS" AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS]) @@ -9,4 +9,4 @@ Name: X11 Description: X Library Version: @PACKAGE_VERSION@ Libs: -L${libdir} -lX11 @XPROTO_LIBS@ @LIBS@ -Cflags: -I${includedir} @XPROTO_CFLAGS@ +Cflags: -I${includedir} @XPROTO_CFLAGS@ @XTHREAD_CFLAGS@ |