[PATCH xf86-video-amdgpu] Untangle HAS_XORG_CONF_DIR / --with-xorg-conf-dir lines in configure.ac

[PATCH xf86-video-amdgpu] Untangle HAS_XORG_CONF_DIR / --with-xorg-conf-dir lines in configure.ac

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer@amd.com>

$sysconfigdir used to be part of the default --with-xorg-conf-dir value,
but it no longer is.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
 configure.ac | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 68e1feb..c3af085 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,18 +82,19 @@ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
                   HAVE_XEXTPROTO_71="no")
 AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 
-# Define a configure option for an alternate X Server configuration directory
 # Section "OutputClass" is only supported as of xserver 1.16
 PKG_CHECK_EXISTS([xorg-server >= 1.16],
 		 [sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`],
 		 [sysconfigdir=""])
+AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
+
+# Define a configure option for an alternate X Server configuration directory
 AC_ARG_WITH(xorg-conf-dir,
             AS_HELP_STRING([--with-xorg-conf-dir=DIR],
                            [Default xorg.conf.d directory [[default=${prefix}/share/X11/xorg.conf.d]]]),
             [configdir="$withval"],
             [configdir='${prefix}/share/X11/xorg.conf.d'])
 AC_SUBST(configdir)
-AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
 
 AC_ARG_ENABLE([udev],
 		AS_HELP_STRING([--disable-udev], [Disable libudev support [default=auto]]),
-- 
2.9.3

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH xf86-video-amdgpu] Untangle HAS_XORG_CONF_DIR / --with-xorg-conf-dir lines in configure.ac

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Michel Dänzer
> Sent: Friday, September 16, 2016 3:40 AM
> To: amd-gfx@lists.freedesktop.org
> Subject: [PATCH xf86-video-amdgpu] Untangle HAS_XORG_CONF_DIR / --
> with-xorg-conf-dir lines in configure.ac
> 
> From: Michel Dänzer <michel.daenzer@amd.com>
> 
> $sysconfigdir used to be part of the default --with-xorg-conf-dir value,
> but it no longer is.
> 
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  configure.ac | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 68e1feb..c3af085 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -82,18 +82,19 @@ PKG_CHECK_MODULES(XEXT, [xextproto >=
> 7.0.99.1],
>                    HAVE_XEXTPROTO_71="no")
>  AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71"
> = "yes" ])
> 
> -# Define a configure option for an alternate X Server configuration directory
>  # Section "OutputClass" is only supported as of xserver 1.16
>  PKG_CHECK_EXISTS([xorg-server >= 1.16],
>  		 [sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-
> server`],
>  		 [sysconfigdir=""])
> +AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
> +
> +# Define a configure option for an alternate X Server configuration directory
>  AC_ARG_WITH(xorg-conf-dir,
>              AS_HELP_STRING([--with-xorg-conf-dir=DIR],
>                             [Default xorg.conf.d directory
> [[default=${prefix}/share/X11/xorg.conf.d]]]),
>              [configdir="$withval"],
>              [configdir='${prefix}/share/X11/xorg.conf.d'])
>  AC_SUBST(configdir)
> -AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
> 
>  AC_ARG_ENABLE([udev],
>  		AS_HELP_STRING([--disable-udev], [Disable libudev support
> [default=auto]]),
> --
> 2.9.3
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx