chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd-logind: Fix linking by reordering libraries in LDADD
[elogind.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 33b0ca958ca1bd951d5cb0eb2fc409b29b89d10f..aec85ea6155c2808d24d249e2c557b7611c963c1 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-86,9
+86,9
@@
GOBJECT_INTROSPECTION_CHECK([1.31.1])
AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
enable_introspection=no])
AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
enable_introspection=no])
-AC_
PATH
_TOOL(OBJCOPY, objcopy)
-AC_
PATH
_TOOL(STRINGS, strings)
-AC_
PATH
_TOOL(GPERF, gperf)
+AC_
CHECK
_TOOL(OBJCOPY, objcopy)
+AC_
CHECK
_TOOL(STRINGS, strings)
+AC_
CHECK
_TOOL(GPERF, gperf)
if test -z "$GPERF" ; then
AC_MSG_ERROR([*** gperf not found])
fi
if test -z "$GPERF" ; then
AC_MSG_ERROR([*** gperf not found])
fi
@@
-880,6
+880,11
@@
AS_IF([test "x$0" != "x./configure"], [
AC_SUBST([INTLTOOL_UPDATE], [/bin/true])
])
AC_SUBST([INTLTOOL_UPDATE], [/bin/true])
])
+AC_ARG_ENABLE(tests,
+ [AC_HELP_STRING([--disable-tests], [disable tests])],
+ enable_tests=$enableval, enable_tests=yes)
+AM_CONDITIONAL(ENABLE_TESTS, [test x$enable_tests = xyes])
+
AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])