← Back to branch summary

~ubuntu-branches/ubuntu/trusty/systemd/trusty

« back to all changes in this revision

Viewing changes to configure.ac

Tags: upstream-202
Import upstream version 202

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
20
20
AC_PREREQ([2.64])
21
21
 
22
22
AC_INIT([systemd],
23
 
        [198],
 
23
        [202],
24
24
        [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
25
25
        [systemd],
26
26
        [http://www.freedesktop.org/wiki/Software/systemd])
86
86
   AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
87
87
   enable_introspection=no])
88
88
 
89
 
AC_PATH_TOOL(OBJCOPY, objcopy)
90
 
AC_PATH_TOOL(STRINGS, strings)
91
 
AC_PATH_TOOL(GPERF, gperf)
 
89
AC_CHECK_TOOL(OBJCOPY, objcopy)
 
90
AC_CHECK_TOOL(STRINGS, strings)
 
91
AC_CHECK_TOOL(GPERF, gperf)
92
92
if test -z "$GPERF" ; then
93
93
        AC_MSG_ERROR([*** gperf not found])
94
94
fi
135
135
        --param=ssp-buffer-size=4])
136
136
AC_SUBST([OUR_CFLAGS], $with_cflags)
137
137
 
138
 
AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], [
 
138
AS_CASE([$CFLAGS], [*-O[[12345g\ ]]*], [
139
139
        CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\
140
140
               -Wp,-D_FORTIFY_SOURCE=2])], [
141
141
        python_extra_cflags=-Wp,-U_FORTIFY_SOURCE
275
275
fi
276
276
AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
277
277
if test "x${have_selinux}" != xno ; then
278
 
        sushell=/sbin/sushell
 
278
        SUSHELL=/sbin/sushell
279
279
else
280
 
        sushell=/bin/sh
 
280
        SUSHELL=/bin/sh
281
281
fi
282
 
AC_SUBST(sushell)
 
282
AC_SUBST(SUSHELL)
283
283
 
284
284
# ------------------------------------------------------------------------------
285
285
have_xz=no
683
683
AC_SUBST(KBD_LOADKEYS)
684
684
AC_SUBST(KBD_SETFONT)
685
685
 
 
686
AC_ARG_WITH(telinit,
 
687
        AS_HELP_STRING([--with-telinit=PATH],
 
688
                [Path to telinit]),
 
689
        [TELINIT="$withval"],
 
690
        [TELINIT="/lib/upstart/telinit"])
 
691
 
 
692
AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit])
 
693
 
 
694
AC_SUBST(TELINIT)
 
695
 
 
696
AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h])
 
697
 
686
698
# ------------------------------------------------------------------------------
687
699
have_myhostname=no
688
700
AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))
705
717
# ------------------------------------------------------------------------------
706
718
AC_ARG_WITH(firmware-path,
707
719
       AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
708
 
          [Firmware search path (default=ROOTPREFIX/lib/firmware/updates:ROOTPREFIX/lib/firmware)]),
709
 
       [], [with_firmware_path="$rootprefix/lib/firmware/updates:$rootprefix/lib/firmware"])
 
720
          [Firmware search path (default="")]),
 
721
       [], [with_firmware_path=""])
710
722
OLD_IFS=$IFS
711
723
IFS=:
712
724
for i in $with_firmware_path; do
717
729
       fi
718
730
done
719
731
IFS=$OLD_IFS
720
 
AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
 
732
AC_SUBST(FIRMWARE_PATH)
 
733
AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
 
734
AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
721
735
 
722
736
# ------------------------------------------------------------------------------
723
737
AC_ARG_ENABLE([gudev],
724
738
       AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
725
739
       [], [enable_gudev=yes])
726
 
AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0]) ])
 
740
AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ])
727
741
AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
 
742
AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
728
743
 
729
744
# ------------------------------------------------------------------------------
730
745
AC_ARG_ENABLE([keymap],
742
757
AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"])
743
758
 
744
759
# ------------------------------------------------------------------------------
 
760
DEBUGTTY=/dev/tty9
 
761
AC_ARG_WITH([debugshelltty],
 
762
        [AS_HELP_STRING([--with-debugshelltty=PATH],
 
763
                [Specify the tty device for debug shell])],
 
764
        [DEBUGTTY="$withval"],
 
765
        [])
 
766
AC_SUBST(DEBUGTTY)
 
767
 
 
768
# ------------------------------------------------------------------------------
745
769
have_manpages=no
746
770
AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
747
771
AS_IF([test "x$enable_manpages" != xno], [
856
880
        AC_SUBST([INTLTOOL_UPDATE], [/bin/true])
857
881
])
858
882
 
 
883
AC_ARG_ENABLE(tests,
 
884
       [AC_HELP_STRING([--disable-tests], [disable tests])],
 
885
       enable_tests=$enableval, enable_tests=yes)
 
886
AM_CONDITIONAL(ENABLE_TESTS, [test x$enable_tests = xyes])
 
887
 
859
888
AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
860
889
AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
861
890
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
939
968
        Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
940
969
 
941
970
        CFLAGS:                  ${OUR_CFLAGS} ${CFLAGS}
942
 
        CPPLAGS:                 ${OUR_CPPFLAGS} ${CPPFLAGS}
 
971
        CPPFLAGS:                ${OUR_CPPFLAGS} ${CPPFLAGS}
943
972
        LDFLAGS:                 ${OUR_LDFLAGS} ${LDFLAGS}
944
973
        PYTHON_CFLAGS:           ${PYTHON_CFLAGS}
945
974
        PYTHON_LIBS:             ${PYTHON_LIBS}