frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS 

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alan Coopersmith 2009-10-02 16:51:24 -07:00
parent 4b0911565d
commit 2e294380b6
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.ac
View File

@ -32,10 +32,9 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
# Require xorg-macros version 1.2.0 or newer for XORG_CHANGELOG and # Require xorg-macros version 1.3.0 or newer for XORG_DEFAULT_OPTIONS
# XORG_CWARNFLAGS m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.3)
XORG_MACROS_VERSION(1.2)
dnl this gets generated by autoheader, and thus contains all the defines. we dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally. dnl don't ever actually use it, internally.
@ -74,6 +73,11 @@ AC_SYS_LARGEFILE
XORG_PROG_RAWCPP XORG_PROG_RAWCPP
AC_PATH_PROG(SED,sed) AC_PATH_PROG(SED,sed)
XORG_DEFAULT_OPTIONS
# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
# easier overrides at build time.
XSERVER_CFLAGS='$(CWARNFLAGS)'
dnl Check for dtrace program (needed to build Xserver dtrace probes) dnl Check for dtrace program (needed to build Xserver dtrace probes)
dnl Also checks for <sys/sdt.h>, since some Linux distros have an dnl Also checks for <sys/sdt.h>, since some Linux distros have an
dnl ISDN trace program named dtrace dnl ISDN trace program named dtrace
@ -419,7 +423,6 @@ case $host_os in
;; ;;
esac esac
XORG_RELEASE_VERSION
dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the
dnl major number dnl major number
PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
@ -439,8 +442,9 @@ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRIN
dnl Build options. dnl Build options.
AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],
[Treat warnings as errors (default: disabled)]), [Obsolete - use --enable-strict-compilation instead]),
[WERROR=$enableval], [WERROR=no]) AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation]))
AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
[Enable debugging (default: disabled)]), [Enable debugging (default: disabled)]),
[DEBUGGING=$enableval], [DEBUGGING=no]) [DEBUGGING=$enableval], [DEBUGGING=no])
@ -1315,7 +1319,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers # XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers
# require. # require.
# #
XSERVER_CFLAGS="${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}" XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS} ${SHA1_CFLAGS}"
XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB" XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}" XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${SHA1_LIB}"
AC_SUBST([XSERVER_LIBS]) AC_SUBST([XSERVER_LIBS])
@ -1328,14 +1332,9 @@ AC_SUBST([UTILS_SYS_LIBS])
# Some platforms require extra flags to do this. gcc should set these flags # Some platforms require extra flags to do this. gcc should set these flags
# when -rdynamic is passed to it, other compilers/linkers may need to be added # when -rdynamic is passed to it, other compilers/linkers may need to be added
# here. # here.
XORG_CWARNFLAGS
if test "x$GCC" = "xyes"; then if test "x$GCC" = "xyes"; then
if test "x$WERROR" = "xyes"; then
CWARNFLAGS="${CWARNFLAGS} -Werror"
fi
LD_EXPORT_SYMBOLS_FLAG="-rdynamic" LD_EXPORT_SYMBOLS_FLAG="-rdynamic"
fi fi
XSERVER_CFLAGS="$CWARNFLAGS $XSERVER_CFLAGS"
case $host_os in case $host_os in
openbsd*) openbsd*)
LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic" LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-dynamic"
@ -1996,10 +1995,6 @@ AC_SUBST([libdir])
AC_SUBST([exec_prefix]) AC_SUBST([exec_prefix])
AC_SUBST([prefix]) AC_SUBST([prefix])
# Man page sections - used in config utils & generating man pages
XORG_MANPAGE_SECTIONS
XORG_CHANGELOG
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
glx/Makefile glx/Makefile