The module directory has changed to a per ABI folder in the xlibre-xserver.
Now the default value of `xorg-module-dir` will be detected from the `moduledir` variable in xorg-server.pc.
Signed-off-by: b-aaz <b-aazbsd.proton.me>
Clears autoconf warnings:
configure.ac:38: warning: The macro 'AC_PROG_LIBTOOL' is obsolete.
configure.ac:38: You should run autoupdate.
aclocal.m4:3515: AC_PROG_LIBTOOL is expanded from...
configure.ac:38: the top level
configure.ac:68: warning: The macro 'AC_HELP_STRING' is obsolete.
configure.ac:68: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:68: the top level
configure.ac:78: warning: The macro 'AC_HELP_STRING' is obsolete.
configure.ac:78: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:78: the top level
libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
libtoolize: and rerunning libtoolize and aclocal.
libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This suite was never really maintained anyway, and it is quite hard to do so
anyway. The driver is linked to the server's API too tightly to easily do
independent testing. We need to re-implement stubs for the API the driver
uses, have to track API changes, etc. Not worth the effort.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Provide a user writable location for configuration files.
Many values will work, but preserving the semantic by using
a value based on the server default value is more helpful.
The configdir automake variable and the pkgconfig sysconfigdir variable
should not be confused with the sysconfdir automake provided
configuration option which default value is $prefix/etc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
This reverts commit 39afe69ad7.
1. For such a small module, the build time improvement is most likely
negligible. At least, I'd like to see some timings proving it's
worthiness before seeing the patch go back in.
2. This kind of change would need a thorough review. The need to
operate the build from a single toplevel Makefile is a significant
change. The two most noticeable issues for me are that collapsing all
the Makefiles could easily cause namespacing issues with the
variables, and operating on files outside the current directory can
introduce subtle bugs. I feel that the non-recursive style is
generally less robust than the standard recursive make scheme.
3. It's unlike all the other X.org modules. This isn't a showstopper
for me, but the recursive style is well understood here and you've
beaten all the modules into a consistent format that makes build bugs
unique to specific modules less likely.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
To give a concrete example for #3 above, the 175 man pages are much
easier maintained using a very similar makefile in the man directory
of all X.Org module.
The cost of maintaining a single makefile is much higher. Every target
in the makefile has to be reviewed and tested when changes are made.
Not everyone has the all the skills to handle widely different targets
such as man pages, DocBook/XML, librairies, C code, distribution hooks,
and so on.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
This reverts commit d27b4e560c.
ChangeLog is generated from git and should be created at dist time only.
The original patch creates it at make time multiple times and fails
when user permissions change such as when using sudo.
Some have expressed a desire to install files such as ChangeLog and README.
This reversal does not dismiss the idea, but simply reverts a non-essential
change that happens to have an implementation bug just before making a module
release.
Anyone is welcome to promote the idea in the context of the X.Org project
where all modules would exhibit the same behaviour. The current behaviour of
ChangeLog, although not perfect, has been thoroughly reviewed and widely
accepted for several years.
As for the files in docs, they should be re-submitted for reviews to determine
if they constitute users docs that should be installed as opposed to
developers docs which are not.
Reported-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
This reverts commit 6eb829e07e.
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@videotron.ca>
With this change it is possible to complete "make distcheck" safely on the
module, as it no longer tries to write to system directories.
Since synaptics also installs a configuration file, xorg-conf-dir also
needs to be overridden during distcheck.
Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
With this change, the whole of the build is done non-recursively in the
top-level Makefile.am. This reduces the amount of overhead due to recursing
into directories only to build one file.
Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
Signed-off-by: Christoph Brill <egore911@egore911.de>
Also adds a bunch of fake symbols so we can link. Note that any of these
symbols will return false, 0 or whatever the zero value for the symbol is.
Care must be taken when writing test that this doesn't screw up the test.
Tests are always built but only run on make check.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
If the server exports the sysconfigdir variable, install the
50-synaptics.conf snippet in the directory provided.
This patch also moves the fdi file from fdi/ into the new conf/ subdir to
have a single location for all config files.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
This file causes devices having the capability "input.touchpad" to use our
driver if they were made by Synaptics or ALPS. This file might need additions
for other devices (i.e. I don't think Apple hardware is covered by this file).
Note: This file is not installed by default. Distributions are free to install
it or leave it.
