X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=850987d7bc5f2b89e51cca0a0445250bff687165;hp=95456cd0bc9ba41235ec3b9256ecebba9de9d39a;hb=a7b6f8e578724c3b4f0cfc8777d9b4a8e29207b0;hpb=d7c114c00030309435fc56c77c8578a25d228ebe diff --git a/configure.ac b/configure.ac index 95456cd0b..850987d7b 100644 --- a/configure.ac +++ b/configure.ac @@ -17,14 +17,14 @@ AC_PREREQ(2.63) -AC_INIT([systemd],[0],[mzflfgrzq (at) 0pointer (dot) net]) -AC_CONFIG_SRCDIR([main.c]) +AC_INIT([systemd],[0],[systemd-devel@lists.freedesktop.org]) +AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax]) +AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects]) -AC_SUBST(PACKAGE_URL, [http://git.0pointer.de/?p=systemd.git]) +AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd]) AC_CANONICAL_HOST @@ -37,18 +37,61 @@ AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [ ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" ]) +AC_PROG_MKDIR_P +AC_PROG_LN_S +AC_PROG_SED + AC_PROG_CC AC_PROG_CC_C99 AM_PROG_CC_C_O AC_PROG_GCC_TRADITIONAL AC_USE_SYSTEM_EXTENSIONS -CC_CHECK_CFLAGS_APPEND([-Wall -W -Wextra -pipe -Wno-long-long -Winline -Wvla -Wno-overlength-strings -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing=2 -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option -Wno-missing-field-initializers]) +CC_CHECK_CFLAGS_APPEND([ \ + -Wall \ + -W \ + -Wextra \ + -pipe \ + -Wno-long-long \ + -Winline \ + -Wvla \ + -Wno-overlength-strings \ + -Wundef \ + -Wformat=2 \ + -Wlogical-op \ + -Wsign-compare \ + -Wformat-security \ + -Wmissing-include-dirs \ + -Wformat-nonliteral \ + -Wold-style-definition \ + -Wpointer-arith \ + -Winit-self \ + -Wdeclaration-after-statement \ + -Wfloat-equal \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wredundant-decls \ + -Wmissing-declarations \ + -Wmissing-noreturn \ + -Wshadow \ + -Wendif-labels \ + -Wcast-align \ + -Wstrict-aliasing=2 \ + -Wwrite-strings \ + -Wno-unused-parameter \ + -ffast-math \ + -Wp,-D_FORTIFY_SOURCE=2 \ + -fno-common \ + -fdiagnostics-show-option \ + -Wno-missing-field-initializers]) 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_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])]) +# 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 ]) AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) @@ -61,22 +104,45 @@ PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ]) AC_SUBST(DBUSGLIB_CFLAGS) AC_SUBST(DBUSGLIB_LIBS) -PKG_CHECK_MODULES(GEE, [ gee-1.0 ]) -AC_SUBST(GEE_CFLAGS) -AC_SUBST(GEE_LIBS) - -PKG_CHECK_MODULES(GTK, [ gtk+-2.0 ]) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) +have_gtk=no +AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools])) +if test "x$enable_gtk" != "xno"; then + PKG_CHECK_MODULES(GTK, [ gtk+-2.0 ], + [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + if test "x$have_gtk" = xno -a "x$enable_gtk" = xyes; then + AC_MSG_ERROR([*** gtk support requested but libraries not found]) + fi +fi +AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"]) -PKG_CHECK_MODULES(CGROUP, [ libcgroup ]) +PKG_CHECK_MODULES( CGROUP, [ libcgroup >= 0.35 ], [], [ + AC_CHECK_HEADER( [libcgroup.h], [], [AC_MSG_ERROR([*** libcgroup.h not found])], ) + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CGROUP_LIBS=${CGROUP_LIBS:--lcgroup} + LIBS="$LIBS $CGROUP_LIBS" + CPPFLAGS="$CPPFLAGS $CGROUP_CFLAGS" + AC_MSG_CHECKING([for libcgroup >= 0.35]) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include ]], [[ CGFLAG_DELETE_RECURSIVE; cgroup_init(); ]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]); AC_MSG_ERROR([*** systemd needs libcgroup 0.35 or newer])], + [${CGROUP_LIBS}]) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" +]) AC_SUBST(CGROUP_CFLAGS) AC_SUBST(CGROUP_LIBS) -AM_PROG_VALAC() +AM_PROG_VALAC([0.8]) AC_SUBST(VAPIDIR) -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, or none])) +AC_PATH_PROG([XSLTPROC], [xsltproc]) +AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) + +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo or other])) if test "z$with_distro" = "z"; then if test "$cross_compiling" = yes; then AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) @@ -85,6 +151,8 @@ if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") AC_CHECK_FILE(/etc/debian_version,with_distro="debian") AC_CHECK_FILE(/etc/arch-release,with_distro="arch") + AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo") + AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") fi if test "z$with_distro" = "z"; then with_distro=`uname -s` @@ -96,52 +164,104 @@ case $with_distro in fedora) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d - special_dbus_service=messagebus.service - special_syslog_service=rsyslog.service + SPECIAL_DBUS_SERVICE=messagebus.service + SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) ;; suse) SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc/init.d - special_dbus_service=dbus.service - special_syslog_service=syslog.service + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=syslog.service AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES]) ;; debian) SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc - special_dbus_service=dbus.service - special_syslog_service=sysklogd.service + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian/Ubuntu]) ;; arch) SYSTEM_SYSVINIT_PATH=/etc/rc.d SYSTEM_SYSVRCND_PATH=/etc - special_dbus_service=dbus.service - special_syslog_service=syslog-ng.service + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=syslog-ng.service AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux]) ;; - none) - SYSTEM_SYSVINIT_PATH=/fix/the/configure/script - SYSTEM_SYSVRCND_PATH=/fix/the/configure/script - special_dbus_service=fix-the-configure-script.service - special_syslog_service=fix-the-configure-script.service + gentoo) + SYSTEM_SYSVINIT_PATH=/etc/init.d + SYSTEM_SYSVRCND_PATH=/etc + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=syslog-ng.service + AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo]) + ;; + slackware) + SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d + SYSTEM_SYSVRCND_PATH=/etc/rc.d + SPECIAL_DBUS_SERVICE=messagebus.service + SPECIAL_SYSLOG_SERVICE=syslog.service + AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware]) + ;; + other) + AS_IF([test "x$with_sysvinit_path" = "x"], + [AC_MSG_ERROR([With --distro=none, you must pass --with-sysvinit-path to configure])]) + AS_IF([test "x$with_sysvrcd_path" = "x"], + [AC_MSG_ERROR([With --distro=none, you must pass --with-sysvrcd-path to configure])]) + AS_IF([test "x$with_dbus_service" = "x"], + [AC_MSG_ERROR([With --distro=none, you must pass --with-dbus-service to configure])]) + AS_IF([test "x$with_syslog_service" = "x"], + [AC_MSG_ERROR([With --distro=none, you must pass --with-syslog-service to configure])]) ;; *) - AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, SysV init scripts could not be found! (patches welcome); you can specify --with-distro=none to skip this check]) + AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, SysV init scripts could not be found! (patches welcome); you can specify --with-distro=other to skip this check]) ;; esac +AC_ARG_WITH([sysvinit-path], + [AS_HELP_STRING([--with-sysvinit-path=PATH], + [Specify the path to where the SysV init scripts are located @<:@default=based on distro@:>@])], + [SYSTEM_SYSVINIT_PATH="$withval"], + []) + +AC_ARG_WITH([sysvrcd-path], + [AS_HELP_STRING([--with-sysvrcd-path=PATH], + [Specify the path to the base directory for the SysV rcN.d directories @<:@default=based on distro@:>@])], + [SYSTEM_SYSVRCND_PATH="$withval"], + []) + +AC_ARG_WITH([dbus-service], + [AS_HELP_STRING([--with-dbus-service=PATH], + [Specify the name of the special DBus service @<:@default=based on distro@:>@])], + [SPECIAL_DBUS_SERVICE="$withval"], + []) + +AC_ARG_WITH([syslog-service], + [AS_HELP_STRING([--with-syslog-service=PATH], + [Specify the name of the special syslog service @<:@default=based on distro@:>@])], + [SPECIAL_SYSLOG_SERVICE="$withval"], + []) + AC_SUBST(SYSTEM_SYSVINIT_PATH) AC_SUBST(SYSTEM_SYSVRCND_PATH) +AC_SUBST(SPECIAL_DBUS_SERVICE) +AC_SUBST(SPECIAL_SYSLOG_SERVICE) AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora) AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) +AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) +AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) + +AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name]) +AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name]) -AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$special_dbus_service"], [D-Bus service name]) -AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$special_syslog_service"], [syslog service name]) +AC_ARG_WITH([udevrulesdir], + AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]), + [], + [with_udevrulesdir=/lib/udev/rules.d]) +AC_SUBST([udevrulesdir], [$with_udevrulesdir]) AC_OUTPUT([Makefile]) @@ -151,6 +271,8 @@ echo " Distribution: ${with_distro} SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} - Syslog service: ${special_syslog_service} - D-Bus service: ${special_dbus_service} + Syslog service: ${SPECIAL_SYSLOG_SERVICE} + D-Bus service: ${SPECIAL_DBUS_SERVICE} + Gtk: ${have_gtk} + udev rules dir: ${with_udevrulesdir} "