chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.freedesktop.org/git/systemd
[elogind.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 5e505365d3b8f8bbee8ae31f3897892d1fdbcbc1..af20151fbbf954612f0f56ea97f638737838f1eb 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-92,7
+92,7
@@
AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n
# This makes sure pkg.m4 is available.
m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
# This makes sure pkg.m4 is available.
m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
-PKG_CHECK_MODULES(UDEV, [ libudev ])
+PKG_CHECK_MODULES(UDEV, [ libudev
>= 154
])
AC_SUBST(UDEV_CFLAGS)
AC_SUBST(UDEV_LIBS)
AC_SUBST(UDEV_CFLAGS)
AC_SUBST(UDEV_LIBS)
@@
-179,7
+179,7
@@
case $with_distro in
;;
suse)
SYSTEM_SYSVRCND_PATH=/etc/init.d
;;
suse)
SYSTEM_SYSVRCND_PATH=/etc/init.d
- AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLE
S
])
+ AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLE])
M4_DISTRO_FLAG=-DTARGET_SUSE=1
;;
debian)
M4_DISTRO_FLAG=-DTARGET_SUSE=1
;;
debian)
@@
-269,7
+269,14
@@
AC_ARG_WITH([udevrulesdir],
[with_udevrulesdir=/lib/udev/rules.d])
AC_SUBST([udevrulesdir], [$with_udevrulesdir])
[with_udevrulesdir=/lib/udev/rules.d])
AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-AC_OUTPUT([Makefile])
+AC_ARG_WITH([rootdir],
+ AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
+ [],
+ [with_rootdir=${ac_default_prefix}])
+AC_SUBST([rootdir], [$with_rootdir])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
echo "
$PACKAGE_NAME $VERSION
echo "
$PACKAGE_NAME $VERSION
@@
-280,5
+287,7
@@
echo "
Syslog service: ${SPECIAL_SYSLOG_SERVICE}
D-Bus service: ${SPECIAL_DBUS_SERVICE}
Gtk: ${have_gtk}
Syslog service: ${SPECIAL_SYSLOG_SERVICE}
D-Bus service: ${SPECIAL_DBUS_SERVICE}
Gtk: ${have_gtk}
+ prefix: ${prefix}
+ root dir: ${with_rootdir}
udev rules dir: ${with_udevrulesdir}
"
udev rules dir: ${with_udevrulesdir}
"