X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=0d2a11fb258827665e7d8ac02aeef66f66f9b7cc;hb=30c768b322f613d697a61997e081a19aecd0b07f;hp=903eeedbe3e32442bc4048c8e993d14fb23910eb;hpb=47ceed78612d48dcda62cc2686fc527d61abe38b;p=free-sw%2Fxcb%2Flibxcb diff --git a/configure.ac b/configure.ac index 903eeed..0d2a11f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,17 +2,13 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT([libXCB], - 0.9, +AC_INIT([libxcb], + 0.9.93, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb.pc.in]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) -dnl This ifdef has no useful effect prior to automake 1.9, but in 1.9 -dnl it allows the user to not have check.m4 installed. -m4_ifdef([AM_PATH_CHECK],[ -AM_PATH_CHECK(0.8.2, [HAVE_CHECK=true], [HAVE_CHECK=false]) -]) +PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=true], [HAVE_CHECK=false]) AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xtrue) AC_CONFIG_HEADERS([src/config.h]) @@ -34,9 +30,23 @@ 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(XAU, xau) +PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9.93) +NEEDED="xau pthread-stubs" +PKG_CHECK_MODULES(NEEDED, $NEEDED) + +PKG_CHECK_MODULES(XDMCP, xdmcp, + AC_CHECK_LIB(Xdmcp, XdmcpWrap, + [ + AC_DEFINE(HASXDMAUTH,1,[Has Wraphelp.c needed for XDM AUTH protocols]) + NEEDED="$NEEDED xdmcp" + ], + [ + XDMCP_CFLAGS= + XDMCP_LIBS= + ], [$XDMCP_LIBS]), + [AC_MSG_RESULT(no)]) + +AC_SUBST(NEEDED) # Find the xcb-proto protocol descriptions AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) @@ -45,40 +55,35 @@ AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) AC_SUBST(XCBPROTO_XCBINCLUDEDIR) AC_HEADER_STDC -AC_SEARCH_LIBS(gethostbyname, nsl) +AC_SEARCH_LIBS(getaddrinfo, socket) AC_SEARCH_LIBS(connect, socket) -xcbincludedir='${includedir}/X11/XCB' +xcbincludedir='${includedir}/xcb' AC_SUBST(xcbincludedir) -AC_ARG_WITH(opt, -AC_HELP_STRING([--with-opt], [compile with reasonable optimizations]) -AC_HELP_STRING([--with-opt=FLAGS], [compile with specified FLAGS]) -AC_HELP_STRING([--with-opt=small], [compile for smallest code]) -AC_HELP_STRING([--with-opt=debug], [compile for debugging (default)]), -[ - case "$withval" in - yes) - optflags="-O3" - ;; - small) - optflags="-Os -fomit-frame-pointer -DNDEBUG" - ;; - no|debug) - optflags="-g" - ;; - *) - optflags="$withval" - ;; - esac -]) -AC_CACHE_CHECK([what compiler optimizations to apply], [optflags], [optflags="-g"]) -AC_DEFINE(_XOPEN_SOURCE, 500, [Conform to Single Unix Specification.]) -CDEBUGFLAGS="$optflags -Wall -pedantic -Wpointer-arith \ - -Wstrict-prototypes -Wmissing-declarations -Wnested-externs" -AC_SUBST(CDEBUGFLAGS) - -AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile]) -AC_CONFIG_FILES([xcb.pc]) +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() + +# htmldir is not defined prior to autoconf 2.59c, so on earlier versions +# set an equivalent value. +AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME], + ['${datadir}/doc/${PACKAGE_TARNAME}'], + ['${datadir}/doc/${PACKAGE}']) +])]) +AM_CHECK_DOXYGEN() + +AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile]) +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_CONFIG_FILES([doc/xcb.doxygen]) AC_OUTPUT