AC_PROG_CC & AC_PROG_SED are provided by XORG_DEFAULT_OPTIONS now PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables XORG_DEFAULT_OPTIONS includes XORG_STRICT_OPTION to set -Werror
Assume systems have xrender.pc now - those building on older systems can set RC_LIBS="-lXrender -lXext -lX11" plus any -I/-L/-R flags they need in RC_CFLAGS & RC_LIBS. Signed-off-by: Alan Coopersmith <[email protected]> --- configure.ac | 30 +----------------------------- 1 files changed, 1 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 49bee7c..4d1db26 100644 --- a/configure.ac +++ b/configure.ac @@ -18,40 +18,12 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AC_PROG_CC -AC_PROG_SED - - # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([err.h]) -AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], - [Treat warnings as errors (default: disabled)]), - [WERROR=$enableval], [WERROR=no]) - # Checks for pkg-config packages -PKG_CHECK_MODULES(RC, xrender, - [xrender_found_with_pkgconfig=yes], - [xrender_found_with_pkgconfig=no]) - -if test "$xrender_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - RC_CFLAGS="$X_CFLAGS" - RC_LIBS="$X_LIBS -lXrender -lXext -lX11" -fi - -if test "x$GCC" = "xyes" -a "x$WERROR" = "xyes"; then - RC_CFLAGS="$RC_CFLAGS -Werror" -fi -AC_SUBST(RC_CFLAGS) -AC_SUBST(RC_LIBS) +PKG_CHECK_MODULES(RC, [xrender x11]) AC_CONFIG_FILES([Makefile man/Makefile]) -- 1.7.3.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
