Stop setting DEB_CONFIGURE_EXTRA_FLAGS = --with-opt in debian/rules; cdbs does the...

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

diff --git a/configure.ac b/configure.ac
index 903eeed..39d56cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,17 @@ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9)
 PKG_CHECK_MODULES(XPROTO, xproto)
 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`
@@ -55,30 +66,60 @@ 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)]),
+AC_HELP_STRING([--without-opt],    [compile without optimization (default)]),
 [
        case "$withval" in
        yes)
-               optflags="-O3"
+               COPTFLAGS="-O3"
                ;;
        small)
-               optflags="-Os -fomit-frame-pointer -DNDEBUG"
+               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|debug)
-               optflags="-g"
+       no)
+               CDEBUGFLAGS=""
                ;;
        *)
-               optflags="$withval"
+               CDEBUGFLAGS="$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_CACHE_CHECK([what debugging options to apply], [CDEBUGFLAGS], [CDEBUGFLAGS="-g"])
 AC_SUBST(CDEBUGFLAGS)
 
+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-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-xprint.pc xcb-xtest.pc xcb-xv.pc xcb-xvmc.pc])
 
 AC_OUTPUT