X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=e0a2526774de8bea0f4f94d2330529273e6ecc1a;hp=67c5e007c6faf83db93d581382a4fb37c9c767ac;hb=4bf43a32a96465d2f9c244adea3e661075f208bf;hpb=80a5cbace45a6adbf2f9119edc5a4b10db493064 diff --git a/configure.ac b/configure.ac index 67c5e007c..e0a252677 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], + [185], [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd], [systemd], [http://www.freedesktop.org/wiki/Software/systemd]) @@ -64,10 +65,12 @@ AC_PATH_PROG([M4], [m4]) # 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) @@ -169,6 +172,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 @@ -414,33 +423,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) @@ -515,20 +519,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 @@ -541,8 +542,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 ;; @@ -561,19 +562,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= @@ -590,7 +588,6 @@ case $with_distro in SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia]) M4_DISTRO_FLAG=-DTARGET_MAGEIA=1 - have_plymouth=yes ;; other) ;; @@ -631,11 +628,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,7 +643,6 @@ 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], @@ -743,7 +734,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} @@ -757,7 +747,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} @@ -767,4 +756,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} ])