depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build: Fix distcheck'ing not working

Browse source 
We need to be able to override the udev rules directory for
distchecking to work.
This commit is contained in:
Bastien Nocera 2012-08-14 15:12:20 +01:00
parent 2d09b10a27
commit d05c69698c
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -11,7 +11,7 @@ endif
DIST_SUBDIRS = libfprint doc examples DIST_SUBDIRS = libfprint doc examples
DISTCHECK_CONFIGURE_FLAGS = --with-drivers=upekts,upeke2,upeksonly,uru4000,vcom5s,aes2501,aes1610,aes4000,vfs101 --enable-examples-build --enable-x11-examples-build DISTCHECK_CONFIGURE_FLAGS = --with-drivers=upekts,upeke2,upeksonly,uru4000,vcom5s,aes2501,aes1610,aes4000,vfs101 --enable-examples-build --enable-x11-examples-build --with-udev-rules-dir='$${libdir}/udev/rules.d-distcheck'
pkgconfigdir=$(libdir)/pkgconfig pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA=libfprint.pc pkgconfig_DATA=libfprint.pc

11
configure.ac
View file

@ -129,7 +129,16 @@ AC_SUBST(GLIB_LIBS)
imagemagick_found=no imagemagick_found=no
gdkpixbuf_found=no gdkpixbuf_found=no
AC_SUBST([udev_rulesdir], [$($PKG_CONFIG --variable=udevdir udev)/rules.d]) AC_ARG_WITH(udev-rules-dir,
AS_HELP_STRING([--with-udev-rules-dir=DIR],[Installation path for udev rules @<:@auto@:>@]),
[ac_with_udev_rules_dir=$withval],
[ac_with_udev_rules_dir=""])
if test "${ac_with_udev_rules_dir}" = ""; then
ac_with_udev_rules_dir=`$PKG_CONFIG --variable=udevdir udev`/rules.d
fi
AC_MSG_NOTICE([installing udev rules in ${ac_with_udev_rules_dir}])
AC_SUBST([udev_rulesdir],[${ac_with_udev_rules_dir}])
if test "$require_imaging" = "yes"; then if test "$require_imaging" = "yes"; then
PKG_CHECK_MODULES(IMAGING, gthread-2.0 gdk-pixbuf-2.0, [gdkpixbuf_found=yes], [gdkpixbuf_found=no]) PKG_CHECK_MODULES(IMAGING, gthread-2.0 gdk-pixbuf-2.0, [gdkpixbuf_found=yes], [gdkpixbuf_found=no])