X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=03644a6d60af8335e4b7a319394aac1f453c2e36;hp=5a4fc84588a265d7c6e309f229a002e34c6244fe;hb=d4943dc7559dff51d4d3bb737232b9328d6726e1;hpb=92ec4495f76a7a2a6c31f5bb2a5240f78dcfe1d2 diff --git a/configure.ac b/configure.ac index 5a4fc8458..03644a6d6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,4 @@ + # This file is part of systemd. # # Copyright 2010-2012 Lennart Poettering @@ -19,7 +20,7 @@ AC_PREREQ([2.64]) AC_INIT([systemd], - [182], + [186], [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd], [systemd], [http://www.freedesktop.org/wiki/Software/systemd]) @@ -62,16 +63,14 @@ AC_PROG_GCC_TRADITIONAL AC_PATH_PROG([M4], [m4]) -# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have -# it on it's own line. +# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line m4_ifdef([GTK_DOC_CHECK], [ -GTK_DOC_CHECK([1.18]) -],[ -AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) -]) - +GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) +], [AM_CONDITIONAL([ENABLE_GTK_DOC], [false])]) +m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [ GOBJECT_INTROSPECTION_CHECK([1.31.1]) +], [AM_CONDITIONAL([HAVE_INTROSPECTION], [false])]) AC_CHECK_TOOL(OBJCOPY, objcopy) AC_CHECK_TOOL(STRINGS, strings) @@ -80,6 +79,10 @@ if test -z "$GPERF" ; then AC_MSG_ERROR([*** gperf not found]) fi +# we use python only to build the man page index +AM_PATH_PYTHON(,, [:]) +AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) + CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -pipe \ -Wall \ @@ -173,6 +176,12 @@ if test "x$enable_selinux" != "xno"; then fi fi AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"]) +if test "x${have_selinux}" != xno ; then + sushell=/sbin/sushell +else + sushell=/bin/bash +fi +AC_SUBST(sushell) # ------------------------------------------------------------------------------ have_xz=no @@ -328,7 +337,7 @@ AC_SUBST(AUDIT_LIBS) have_libcryptsetup=no AC_ARG_ENABLE(libcryptsetup, AS_HELP_STRING([--disable-libcryptsetup], [disable libcryptsetup tools])) if test "x$enable_libcryptsetup" != "xno"; then - PKG_CHECK_MODULES(LIBCRYPTSETUP, [ libcryptsetup ], + PKG_CHECK_MODULES(LIBCRYPTSETUP, [ libcryptsetup >= 1.4.2 ], [AC_DEFINE(HAVE_LIBCRYPTSETUP, 1, [Define if libcryptsetup is available]) have_libcryptsetup=yes], have_libcryptsetup=no) if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found]) @@ -418,33 +427,28 @@ fi AM_CONDITIONAL(ENABLE_COREDUMP, [test "$have_coredump" = "yes"]) # ------------------------------------------------------------------------------ -if test "x$cross_compiling" = "xno" ; then - AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids]) - AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids]) - AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids]) -fi - AC_ARG_WITH(usb-ids-path, - [AS_HELP_STRING([--with-usb-ids-path=DIR], [Path to usb.ids file])], - [USB_DATABASE=${withval}], - [if test -n "$usbids" ; then - USB_DATABASE="$usbids" - else - PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82) - AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)]) - fi]) + [AS_HELP_STRING([--with-usb-ids-path=DIR], [Path to usb.ids file])], + [USB_DATABASE=${withval}], + [if test -n "$usbids" ; then + USB_DATABASE="$usbids" + else + PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82) + AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)]) + fi]) AC_MSG_CHECKING([for USB database location]) AC_MSG_RESULT([$USB_DATABASE]) AC_SUBST(USB_DATABASE) AC_ARG_WITH(pci-ids-path, - [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])], - [PCI_DATABASE=${withval}], - [if test -n "$pciids" ; then - PCI_DATABASE="$pciids" - else - AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=]) - fi]) + [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])], + [PCI_DATABASE=${withval}], + [if test -n "$pciids" ; then + PCI_DATABASE="$pciids" + else + PKG_CHECK_MODULES(LIBPCI, libpci >= 3) + AC_SUBST([PCI_DATABASE], [$($PKG_CONFIG --variable=idsdir libpci)/pci.ids]) + fi]) AC_MSG_CHECKING([for PCI database location]) AC_MSG_RESULT([$PCI_DATABASE]) AC_SUBST(PCI_DATABASE) @@ -500,7 +504,7 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "$have_manpages" = "yes"]) 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, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom 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)]) @@ -519,20 +523,17 @@ SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d M4_DEFINES= -have_plymouth=no case $with_distro in fedora) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) M4_DEFINES=-DTARGET_FEDORA=1 - have_plymouth=yes ;; opensuse|suse) SYSTEM_SYSVRCND_PATH=/etc/init.d AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE]) M4_DEFINES=-DTARGET_SUSE=1 - have_plymouth=yes ;; debian) SYSTEM_SYSVRCND_PATH=/etc @@ -545,8 +546,8 @@ case $with_distro in M4_DEFINES=-DTARGET_UBUNTU=1 ;; arch) - SYSTEM_SYSVINIT_PATH=/etc/rc.d - SYSTEM_SYSVRCND_PATH=/etc + SYSTEM_SYSVINIT_PATH= + SYSTEM_SYSVRCND_PATH= AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux]) M4_DEFINES=-DTARGET_ARCH=1 ;; @@ -565,25 +566,16 @@ case $with_distro in SYSTEM_SYSVINIT_PATH=/etc/rc.d AC_DEFINE(TARGET_FRUGALWARE, [], [Target is Frugalware]) M4_DEFINES=-DTARGET_FRUGALWARE=1 - have_plymouth=yes ;; altlinux) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d AC_DEFINE(TARGET_ALTLINUX, [], [Target is ALTLinux]) M4_DEFINES=-DTARGET_ALTLINUX=1 - have_plymouth=yes ;; mandriva) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d AC_DEFINE(TARGET_MANDRIVA, [], [Target is Mandriva]) M4_DEFINES=-DTARGET_MANDRIVA=1 - have_plymouth=yes - ;; - meego) - SYSTEM_SYSVINIT_PATH= - SYSTEM_SYSVRCND_PATH= - AC_DEFINE(TARGET_MEEGO, [], [Target is MeeGo]) - M4_DEFINES=-DTARGET_MEEGO=1 ;; angstrom) SYSTEM_SYSVRCND_PATH=/etc @@ -593,8 +585,7 @@ case $with_distro in mageia) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia]) - M4_DISTRO_FLAG=-DTARGET_MAGEIA=1 - have_plymouth=yes + M4_DEFINES=-DTARGET_MAGEIA=1 ;; other) ;; @@ -635,11 +626,6 @@ AC_ARG_WITH([tty-gid], [AC_DEFINE_UNQUOTED(TTY_GID, [$withval], [GID of the 'tty' group])], []) -AC_ARG_ENABLE(plymouth, AS_HELP_STRING([--enable-plymouth], [enable plymouth support])) -if test -n "$enable_plymouth"; then - have_plymouth="$enable_plymouth" -fi - 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) @@ -651,11 +637,9 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware) AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux) AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) -AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) -AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes") AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") AC_ARG_WITH([dbuspolicydir], @@ -747,7 +731,6 @@ AC_MSG_RESULT([ timedated: ${have_timedated} localed: ${have_localed} coredump: ${have_coredump} - plymouth: ${have_plymouth} firmware path: ${FIRMWARE_PATH} usb.ids: ${USB_DATABASE} pci.ids: ${PCI_DATABASE} @@ -761,7 +744,6 @@ AC_MSG_RESULT([ datarootdir: ${datarootdir} includedir: ${includedir} include_prefix: ${INCLUDE_PREFIX} - libexec dir: ${libexecdir} lib dir: ${libdir} rootlib dir: ${with_rootlibdir} PAM modules dir: ${with_pamlibdir} @@ -771,4 +753,8 @@ AC_MSG_RESULT([ D-Bus interfaces dir: ${with_dbusinterfacedir} Split /usr: ${enable_split_usr} man pages: ${have_manpages} + + CFLAGS: ${CFLAGS} + CPPLAGS: ${CPPFLAGS} + LDFLAGS: ${LDFLAGS} ])