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 2846184..0dd396d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,12 +31,14 @@ AC_SUBST(HTML_CHECK_RESULT)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 0.9.93)
-PKG_CHECK_MODULES(XAU, xau)
+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=
@@ -44,6 +46,8 @@ PKG_CHECK_MODULES(XDMCP, xdmcp,
                ], [$XDMCP_LIBS]),
        [AC_MSG_RESULT(no)])
 
+AC_SUBST(NEEDED)
+
 # Find the xcb-proto protocol descriptions
 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
 XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
@@ -51,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"
@@ -114,6 +74,12 @@ 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])