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 <[email protected]> --- 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]) -- 1.6.0.4 ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
