diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2012-11-25 19:44:28 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-11-25 19:44:28 -0500 |
| commit | 4b3087eb7d016dfa21722e8dff437784251ab55e (patch) | |
| tree | 7c866fa1a48a43dd6afd5768ff12e52d5316b847 /configure.ac | |
| parent | 518c07d5b4b40c8e580897755c400910677d9e21 (diff) | |
Fix up building gudev and introspection under make distcheck
This commit makes sure that src/gudev/gudevprivate.h is included
in the distribution, fixing a failure in building gudev with
`make distcheck`. There's also some code cleanup and migration
of all configurable paths to the main configure.ac file.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5562348f66..61292d9098 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,13 @@ AC_SUBST([udevrulesdir],[${udevconfdir}/rules.d]) AC_SUBST([pkgconfiglibdir], [${libdir}/pkgconfig]) AC_SUBST([sharepkgconfigdir],[${datadir}/pkgconfig]) +# gudev paths +AC_SUBST([libgudev_includedir],[${includedir}/gudev-1.0/gudev]) + +# introspection paths +AC_SUBST([girdir], [${datadir}/gir-1.0]) +AC_SUBST([typelibsdir], [${libdir}/girepository-1.0]) + # ------------------------------------------------------------------------------ GOBJECT_INTROSPECTION_CHECK([1.31.1]) @@ -355,14 +362,15 @@ AC_OUTPUT AC_MSG_RESULT([ prefix: ${prefix} exec_prefix: ${exec_prefix} - sysconf dir: ${sysconfdir} - datarootdir: ${datarootdir} + sysconfdir: ${sysconfdir} + datadir: ${datadir} includedir: ${includedir} libdir: ${libdir} rootprefix: ${rootprefix} rootlibdir: ${rootlibdir} udevlibexecdir: ${udevlibexecdir} + datarootdir: ${datarootdir} udevconfdir: ${udevconfdir} udevconffile: ${udevconffile} @@ -374,6 +382,11 @@ AC_MSG_RESULT([ pkgconfiglibdir: ${libdir}/pkgconfig sharepkgconfigdir ${datadir}/pkgconfig + + libgudev_includedir ${includedir}/gudev-1.0/gudev + + girdir ${datadir}/gir-1.0 + typelibsdir ${libdir}/girepository-1.0 ]) # ------------------------------------------------------------------------------ |