X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=72136cf39a928da11d0ed757d67db1b010dcf3f3;hb=6bc0b37303f26faf6fbdcbbee444c227e83a329c;hp=5e4405cfe005dbdb0c413ea80919bf08dd245029;hpb=06c788932bb635da79076728927b7b93f64037c1;p=free-sw%2Fxcb%2Flibxcb diff --git a/configure.ac b/configure.ac index 5e4405c..72136cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([libXCB], - 0.9, +AC_INIT([libxcb], + 0.9.92, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -34,10 +34,20 @@ fi AC_SUBST(HTML_CHECK_RESULT) # Checks for pkg-config packages -PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9) -PKG_CHECK_MODULES(XPROTO, xproto) +PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9.92) PKG_CHECK_MODULES(XAU, xau) +PKG_CHECK_MODULES(XDMCP, xdmcp, + AC_CHECK_LIB(Xdmcp, XdmcpWrap, + [ + AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols]) + ], + [ + XDMCP_CFLAGS= + XDMCP_LIBS= + ], [$XDMCP_LIBS]), + [AC_MSG_RESULT(no)]) + # Find the xcb-proto protocol descriptions AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` @@ -48,7 +58,7 @@ AC_HEADER_STDC AC_SEARCH_LIBS(gethostbyname, nsl) AC_SEARCH_LIBS(connect, socket) -xcbincludedir='${includedir}/X11/XCB' +xcbincludedir='${includedir}/xcb' AC_SUBST(xcbincludedir) AC_ARG_WITH(opt, @@ -95,11 +105,20 @@ AC_HELP_STRING([--without-debug], [compile without debugging]), AC_CACHE_CHECK([what debugging options to apply], [CDEBUGFLAGS], [CDEBUGFLAGS="-g"]) AC_SUBST(CDEBUGFLAGS) -CWARNFLAGS="-Wall -pedantic -Wpointer-arith \ - -Wstrict-prototypes -Wmissing-declarations -Wnested-externs" +if test "x$GCC" = xyes ; then + CWARNFLAGS="-Wall -pedantic -Wpointer-arith \ + -Wstrict-prototypes -Wmissing-declarations -Wnested-externs" +else + AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) + if test "x$SUNCC" = "xyes"; then + CWARNFLAGS="-v" + fi +fi AC_SUBST(CWARNFLAGS) +GCC_CHECK_VISIBILITY() + AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile]) -AC_CONFIG_FILES([xcb.pc]) +AC_CONFIG_FILES([xcb.pc xcb-xlib.pc xcb-composite.pc xcb-damage.pc xcb-dpms.pc xcb-glx.pc xcb-randr.pc xcb-record.pc xcb-render.pc xcb-res.pc xcb-screensaver.pc xcb-shape.pc xcb-shm.pc xcb-sync.pc xcb-xevie.pc xcb-xf86dri.pc xcb-xfixes.pc xcb-xinerama.pc xcb-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc]) AC_OUTPUT