[PATCH] Byte-swapping and size-checking generator all-in-one

Emil Velikov emil.l.velikov at gmail.com
Wed Mar 11 13:07:13 PDT 2015


Hi Asalle,

Note that I'm not a core xserver developer like the rest of the folks
here, so... take this with a pinch of salt :-P

On 11/03/15 18:46, asalle.kim at gmail.com wrote:
...
> diff --git a/configure.ac b/configure.ac
> index 96524c5..5b89705 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -33,6 +33,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
>  AC_CONFIG_MACRO_DIR([m4])
>  AM_INIT_AUTOMAKE([foreign dist-bzip2])
>  AC_USE_SYSTEM_EXTENSIONS
> +AM_PATH_PYTHON([2.7])
>  
>  # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
>  m4_ifndef([XORG_MACROS_VERSION],
> @@ -576,6 +577,7 @@ AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Pa
>  				[KHRONOS_SPEC_DIR=auto])
>  
>  dnl Extensions.
> +AC_ARG_ENABLE(proto,          AS_HELP_STRING([--disable-composite], [Build Proto (default: enabled)]), [PROTO=$enableval], [PROTO=yes])
>  AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
>  AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-mitshm], [Build SHM extension (default: auto)]), [MITSHM=$enableval], [MITSHM=auto])
>  AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])
> @@ -1036,6 +1038,13 @@ if test "x$COMPOSITE" = xyes; then
>  	COMPOSITE_INC='-I$(top_srcdir)/composite'
>  fi
>  
> +AM_CONDITIONAL(PROTO, [test "x$PROTO" = xyes])
> +if test "x$PROTO" = xyes; then
> +	AC_DEFINE(PROTO, 1, [Support Proto])
> +	PROTO_LIB='$(top_builddir)/proto/libproto.la'
> +	PROTO_INC='-I$(top_srcdir)/proto/generated'
                       ^^^^^^^^^^
I'm suspecting that this should be top_builddir. After all the sources
get generated as part of the build process.

...
> diff --git a/proto/.gitignore b/proto/.gitignore
> new file mode 100644
> index 0000000..cc4611b
> --- /dev/null
> +++ b/proto/.gitignore
> @@ -0,0 +1,5 @@
> +#       Python "compiled" files
> +*.pyc
> +
> +#       Autogenerated by gen_swap_check.py in proto files
> +gen/*
Seems like a typo. Did you mean generated/* ?

As I never remember all the exact details, I have the following ritual:
Run ./autogen.sh && make distcheck and jump over for a cup of
tea/coffee. By the time I'm back the lovely news are on the screen.


Cheers,
Emil



More information about the xorg-devel mailing list