X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=cd682ffd4e02f33b56e727c24a3f62e293237b5a;hb=98e2a5617ef1c9955b3b5553224c34f55c7c5d29;hp=fa49f9a6528dac2200f9b096efeb0a69ebb04f39;hpb=e54dfd73a9652bbc103f3f874abc303aed4b5d76;p=free-sw%2Fxcb%2Flibxcb

diff --git a/configure.ac b/configure.ac
index fa49f9a..cd682ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libxcb],
-        0.9.93,
+        1.0,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -30,8 +30,8 @@ fi
 AC_SUBST(HTML_CHECK_RESULT)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9.93)
-NEEDED="xau pthread-stubs"
+PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.0)
+NEEDED="pthread-stubs xau >= 0.99.2"
 PKG_CHECK_MODULES(NEEDED, $NEEDED)
 
 PKG_CHECK_MODULES(XDMCP, xdmcp,
@@ -55,56 +55,12 @@ 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}/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)
-
 if  test "x$GCC" = xyes ; then
     CWARNFLAGS="-Wall -pedantic -Wpointer-arith \
 		-Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
@@ -128,5 +84,6 @@ 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