chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: don't actually reboot/poweroff/halt if only a wtmp update is requested
[elogind.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index f44b493dd71e5a5edd6ff8897a92e7eaa3f80c2d..3bdd1dd71ac913822de19499fd3cceb4e79ed94d 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-17,7
+17,7
@@
AC_PREREQ(2.63)
AC_PREREQ(2.63)
-AC_INIT([systemd],[
0
],[systemd-devel@lists.freedesktop.org])
+AC_INIT([systemd],[
1
],[systemd-devel@lists.freedesktop.org])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
@@
-48,14
+48,12
@@
AC_PROG_GCC_TRADITIONAL
AC_USE_SYSTEM_EXTENSIONS
CC_CHECK_CFLAGS_APPEND([ \
AC_USE_SYSTEM_EXTENSIONS
CC_CHECK_CFLAGS_APPEND([ \
+ -pipe \
-Wall \
-W \
-Wextra \
-Wall \
-W \
-Wextra \
- -pipe \
- -Wno-long-long \
-Winline \
-Wvla \
-Winline \
-Wvla \
- -Wno-overlength-strings \
-Wundef \
-Wformat=2 \
-Wlogical-op \
-Wundef \
-Wformat=2 \
-Wlogical-op \
@@
-78,12
+76,19
@@
CC_CHECK_CFLAGS_APPEND([ \
-Wcast-align \
-Wstrict-aliasing=2 \
-Wwrite-strings \
-Wcast-align \
-Wstrict-aliasing=2 \
-Wwrite-strings \
+ -Wno-long-long \
+ -Wno-overlength-strings \
-Wno-unused-parameter \
-Wno-unused-parameter \
- -ffast-math \
+ -Wno-missing-field-initializers \
+ -Wno-unused-result \
-Wp,-D_FORTIFY_SOURCE=2 \
-Wp,-D_FORTIFY_SOURCE=2 \
+ -ffast-math \
-fno-common \
-fdiagnostics-show-option \
-fno-common \
-fdiagnostics-show-option \
- -Wno-missing-field-initializers])
+ -fno-strict-aliasing])
+
+LT_PREREQ(2.2)
+LT_INIT
AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])])
AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])])
AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])])
@@
-240,7
+245,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
O
penSUSE/SLE])
+ AC_DEFINE(TARGET_SUSE, [], [Target is
o
penSUSE/SLE])
M4_DISTRO_FLAG=-DTARGET_SUSE=1
;;
debian)
M4_DISTRO_FLAG=-DTARGET_SUSE=1
;;
debian)
@@
-347,7
+352,12
@@
AC_ARG_WITH([dbusinterfacedir],
AC_ARG_WITH([udevrulesdir],
AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]),
[],
AC_ARG_WITH([udevrulesdir],
AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]),
[],
- [with_udevrulesdir=/lib/udev/rules.d])
+ [with_udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d])
+
+AC_ARG_WITH([pamlibdir],
+ AS_HELP_STRING([--with-pamlibdir=DIR], [Diectory for PAM modules]),
+ [],
+ [with_pamlibdir=/lib/`$CC -print-multi-os-directory`/security])
AC_ARG_WITH([rootdir],
AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
AC_ARG_WITH([rootdir],
AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
@@
-359,6
+369,7
@@
AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir])
AC_SUBST([udevrulesdir], [$with_udevrulesdir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir])
AC_SUBST([udevrulesdir], [$with_udevrulesdir])
+AC_SUBST([pamlibdir], [$with_pamlibdir])
AC_SUBST([rootdir], [$with_rootdir])
AC_CONFIG_FILES([Makefile])
AC_SUBST([rootdir], [$with_rootdir])
AC_CONFIG_FILES([Makefile])
@@
-378,6
+389,7
@@
echo "
prefix: ${prefix}
root dir: ${with_rootdir}
udev rules dir: ${with_udevrulesdir}
prefix: ${prefix}
root dir: ${with_rootdir}
udev rules dir: ${with_udevrulesdir}
+ pam modules dir: ${with_pamlibdir}
dbus policy dir: ${with_dbuspolicydir}
dbus session dir: ${with_dbussessionservicedir}
dbus system dir: ${with_dbussystemservicedir}
dbus policy dir: ${with_dbuspolicydir}
dbus session dir: ${with_dbussessionservicedir}
dbus system dir: ${with_dbussystemservicedir}