On Mon, Jan 02, 2012 at 02:10:38PM +0100, Matthieu Herrb wrote: > Signed-off-by: Matthieu Herrb <[email protected]>
Reviewed-by: Peter Hutterer <[email protected]> > --- > configure.ac | 40 ++++++++++++++++++++-------------------- > 1 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 6de92b4..618069d 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -93,7 +93,7 @@ if test "x$GCC" = xyes ; then > fi > > 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 > AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH], > [Enable dtrace probes (default: enabled if dtrace found)]), > @@ -113,7 +113,7 @@ if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; > then > fi > fi > if test "x$WDTRACE" != "xno" ; then > - AC_DEFINE(XSERVER_DTRACE, 1, > + AC_DEFINE(XSERVER_DTRACE, 1, > [Define to 1 if the DTrace Xserver provider probes should be built > in.]) > > # Solaris/OpenSolaris require dtrace -G to build dtrace probe information > into > @@ -184,7 +184,7 @@ b = bswap16(a); > if test "$SYS_ENDIAN_BSWAP" = "yes" ; then > USE_SYS_ENDIAN_H=yes > BSWAP=bswap > - else > + else > if test "$SYS_ENDIAN__SWAP" = "yes" ; then > USE_SYS_ENDIAN_H=yes > BSWAP=__swap > @@ -194,13 +194,13 @@ b = bswap16(a); > fi > > if test "$USE_SYS_ENDIAN_H" = "yes" ; then > - AC_DEFINE([USE_SYS_ENDIAN_H], 1, > + AC_DEFINE([USE_SYS_ENDIAN_H], 1, > [Define to use byteswap macros from <sys/endian.h>]) > - AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, > + AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, > [Define to 16-bit byteswap macro]) > - AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, > + AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, > [Define to 32-bit byteswap macro]) > - AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, > + AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, > [Define to 64-bit byteswap macro]) > fi > fi > @@ -272,7 +272,7 @@ AC_CACHE_CHECK([for SYSV IPC], > #include <sys/ipc.h> > #include <sys/shm.h> > ],[ > -{ > +{ > int id; > id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R); > if (id < 0) return -1; > @@ -284,12 +284,12 @@ if test "x$ac_cv_sysv_ipc" = xyes; then > AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available]) > fi > > -dnl OpenBSD /dev/xf86 aperture driver > +dnl OpenBSD /dev/xf86 aperture driver > if test -c /dev/xf86 ; then > AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver]) > fi > > -dnl BSD APM support > +dnl BSD APM support > AC_CHECK_HEADER([machine/apmvar.h],[ > AC_CHECK_HEADER([sys/event.h], > ac_cv_BSD_KQUEUE_APM=yes, > @@ -297,7 +297,7 @@ AC_CHECK_HEADER([machine/apmvar.h],[ > > AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes]) > AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes]) > - > + > dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c) > AC_CHECK_HEADER([execinfo.h],[ > AC_CHECK_LIB(c, backtrace, [ > @@ -334,7 +334,7 @@ case $host_cpu in > *netbsd*) AC_DEFINE(USE_I386_IOPL) > SYS_LIBS=-li386 > ;; > - *openbsd*) AC_DEFINE(USE_I386_IOPL) > + *openbsd*) AC_DEFINE(USE_I386_IOPL) > SYS_LIBS=-li386 > ;; > esac > @@ -648,7 +648,7 @@ AC_ARG_ENABLE(kdrive-evdev, > AC_HELP_STRING([--enable-kdrive-evdev], [Build evd > > dnl chown/chmod to be setuid root as part of build > dnl Replaces InstallXserverSetUID in imake > -AC_ARG_ENABLE(install-setuid, > +AC_ARG_ENABLE(install-setuid, > AS_HELP_STRING([--enable-install-setuid], > [Install Xorg server as owned by root with setuid bit (default: > auto)]), > [SETUID=$enableval], [SETUID=auto]) > @@ -721,7 +721,7 @@ case $host_os in > [xorg_cv_Carbon_framework=yes], > [xorg_cv_Carbon_framework=no]) > LDFLAGS=$save_LDFLAGS]) > - > + > if test "X$xorg_cv_Carbon_framework" = Xyes; then > XQUARTZ=yes > else > @@ -1652,12 +1652,12 @@ if test "x$XORG" = xyes; then > solaris_asm_inline="yes" > fi > AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"]) > - > + > case $host_cpu in > - sparc*) > + sparc*) > SOLARIS_INOUT_ARCH="sparcv8plus" > ;; > - i*86) > + i*86) > if test x$SOLARIS_64 = xyes ; then > SOLARIS_INOUT_ARCH="amd64" > else > @@ -2029,13 +2029,13 @@ if test "$KDRIVE" = yes; then > # Xephyr needs nanosleep() which is in librt on Solaris > AC_CHECK_FUNC([nanosleep], [], > AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) > - > + > # damage shadow extension glx (NOTYET) fb mi > KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src' > KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC > $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC" > KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux' > KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" > - > + > KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS" > > KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB > $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB > $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB > $COMPOSITE_LIB $OS_LIB" > @@ -2092,7 +2092,7 @@ AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = > xyes && test "x$KDRIVEFB > AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = > xyes]) > > dnl and the rest of these are generic, so they're in config.h > -dnl > +dnl > dnl though, thanks to the passing of some significant amount of time, the > dnl above is probably a complete fallacy, and you should not rely on it. > dnl but this is still actually better than imake, honest. -daniels > -- > 1.7.6 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
