Remove --with-opt and --with-debug options from configure.ac; use CFLAGS instead

[free-sw/xcb/libxcb] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5e4405c..0dd396d 100644 (file)
--- 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,61 +55,34 @@ 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([--without-opt],    [compile without optimization (default)]),
-[
-       case "$withval" in
-       yes)
-               COPTFLAGS="-O3"
-               ;;
-       small)
-               COPTFLAGS="-Os -fomit-frame-pointer -DNDEBUG"
-               ;;
-       no)
-               COPTFLAGS=""
-               ;;
-       *)
-               COPTFLAGS="$withval"
-               ;;
-       esac
-])
-AC_CACHE_CHECK([what compiler optimizations to apply], [COPTFLAGS], [COPTFLAGS=""])
-AC_SUBST(COPTFLAGS)
-
-AC_ARG_WITH(debug,
-AC_HELP_STRING([--with-debug],       [compile with debugging (default)])
-AC_HELP_STRING([--with-debug=FLAGS], [compile with specified debugging FLAGS])
-AC_HELP_STRING([--without-debug],    [compile without debugging]),
-[
-       case "$withval" in
-       yes)
-               CDEBUGFLAGS="-g"
-               ;;
-       no)
-               CDEBUGFLAGS=""
-               ;;
-       *)
-               CDEBUGFLAGS="$withval"
-               ;;
-       esac
-])
-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)
 
-AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
-AC_CONFIG_FILES([xcb.pc])
+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_OUTPUT