[PATCH input-synaptics 1/7] Revert "build: apply the distcheck tricks used in xf86-input-evdev"

[Gaetan Nadon]

This reverts commit 6eb829e07e455a8a04dabae7f257dd42a9b8bcdf.

Althought this feature is desirable, it introduces a dormant bug.

The value of sdkdir during distcheck points to an empty xserver sdkdir
where xserver-properties.h is expected by the tools.

Specifying XORG_CFLAGS for the tools worked around the issue by supplying
the real path to the xserver sdk. tools must not depend on xserver.
In any case it would be a brittle workaround.

--with-xorg-conf-dir='$${sysconfdir}/xorg':
althought this value will work, it brings some confusion as it is
unrelated to the where the configuration files are normally placed,
relative to $prefix which is /usr/share/X11 and not /etc.

This feature can be reintroduced later with the proper solution.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am  |    6 ------
 configure.ac |    5 -----
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e94fe19..07cb902 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,12 +18,6 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# During distcheck, system locations (as provided by pkg-config) are
-# not writable; provide instead relative locations.
-DISTCHECK_CONFIGURE_FLAGS = \
-	--with-sdkdir='$${includedir}/xorg' \
-	--with-xorg-conf-dir='$${sysconfdir}/xorg'
-
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index bf99958..dfef591 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,11 +146,6 @@ if test "x$have_libxtst" = "xyes" ; then
 fi
 # -----------------------------------------------------------------------------
 
-# Workaround overriding sdkdir to be able to create a tarball when user has no
-# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am
-AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
-AC_SUBST([sdkdir])
-
 AC_CONFIG_FILES([Makefile
                 xorg-synaptics.pc])
 AC_OUTPUT
-- 
1.7.4.1