aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac (renamed from configure.in)9
3 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index f7e7f7de..6ceaf226 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,8 @@ edit = @sed \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g'
+DISTCHECK_CONFIGURE_FLAGS = --with-udev-base-dir=$dc_install_base
+
DISTCLEANFILES = \
$(dbusactivation_DATA)
diff --git a/autogen.sh b/autogen.sh
index 7d7a26dc..d2ed9b58 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
REQUIRED_AUTOMAKE_VERSION=1.7
PKG_NAME=ModemManager
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
&& test -f $srcdir/src/mm-modem.c) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
diff --git a/configure.in b/configure.ac
index 1ee1eb53..7a684980 100644
--- a/configure.in
+++ b/configure.ac
@@ -27,6 +27,15 @@ else
fi
AC_SUBST(DBUS_SYS_DIR)
+AC_ARG_WITH(udev-base-dir, AS_HELP_STRING([--with-udev-base-dir=DIR], [where udev base directory is]))
+
+if test -n "$with_udev_base_dir" ; then
+ UDEV_BASE_DIR="$with_udev_base_dir"
+else
+ UDEV_BASE_DIR="/lib/udev"
+fi
+AC_SUBST(UDEV_BASE_DIR)
+
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)