diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-06-01 17:40:05 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-06-02 10:06:04 -0400 |
| commit | c82218973ab7ab47e11d9ae76a9d5e2a246bf420 (patch) | |
| tree | 194aa29533d735362671ee2637bd419e04db7b7a /configure.ac | |
| parent | a8d9fb1c59ef2e7ce4bbaaab30b43ca3d00e93de (diff) | |
| download | xf86-input-wacom-c82218973ab7ab47e11d9ae76a9d5e2a246bf420.tar.gz | |
config: close a loophole where user input means x server has a feature
If a user provides a path in --with-xorg-conf-dir,
the configuartion assumes the server does have a config path which may
not be the case.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 06291de..c21f585 100644 --- a/configure.ac +++ b/configure.ac @@ -85,13 +85,15 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) AC_SUBST([sdkdir]) +# Define a configure option for an alternate X Server configuration directory +sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server` AC_ARG_WITH([xorg-conf-dir], AC_HELP_STRING([--with-xorg-conf-dir=DIR], [Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]), [XORG_CONF_DIR="$withval"], - [XORG_CONF_DIR="`$PKG_CONFIG --variable=sysconfigdir xorg-server`"]) + [XORG_CONF_DIR="$sysconfigdir"]) AC_SUBST(XORG_CONF_DIR) -AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$XORG_CONF_DIR" != "x" && test "x$XORG_CONF_DIR" != "xno"]) +AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"]) DRIVER_NAME=wacom AC_SUBST([DRIVER_NAME]) |