X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=de61b2d52f97984e56ba8c28532b7c592ea15117;hp=95456cd0bc9ba41235ec3b9256ecebba9de9d39a;hb=d1ab0ca07372649dad70a0348d75e394f254e1b6;hpb=d7c114c00030309435fc56c77c8578a25d228ebe diff --git a/configure.ac b/configure.ac index 95456cd0b..de61b2d52 100644 --- a/configure.ac +++ b/configure.ac @@ -43,12 +43,51 @@ 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 +100,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) - -PKG_CHECK_MODULES(CGROUP, [ libcgroup ]) +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 >= 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.7]) 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 none])) 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 +147,7 @@ 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") fi if test "z$with_distro" = "z"; then with_distro=`uname -s` @@ -111,7 +174,7 @@ case $with_distro in SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc special_dbus_service=dbus.service - special_syslog_service=sysklogd.service + special_syslog_service=rsyslog.service AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian/Ubuntu]) ;; arch) @@ -121,6 +184,13 @@ case $with_distro in special_syslog_service=syslog-ng.service AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux]) ;; + 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]) + ;; none) SYSTEM_SYSVINIT_PATH=/fix/the/configure/script SYSTEM_SYSVRCND_PATH=/fix/the/configure/script @@ -139,10 +209,18 @@ 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) 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]) echo " @@ -153,4 +231,6 @@ echo " SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Syslog service: ${special_syslog_service} D-Bus service: ${special_dbus_service} + Gtk: ${have_gtk} + udev rules dir: ${with_udevrulesdir} "