X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=b4386b5d1b45892760e337aa47dcf562258ed0de;hp=2eef62fa32067681b10213fc8464ab687da477c7;hb=d9780e33159ddd1d6431e982bc0e8b27574d0a2a;hpb=f25b623eb0a6543630c876af7b87885a62edc1a6

diff --git a/configure.ac b/configure.ac
index 2eef62fa3..b4386b5d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -525,67 +525,12 @@ fi
 AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])
 
 # ------------------------------------------------------------------------------
-AC_ARG_WITH(kbd-loadkeys,
-        AS_HELP_STRING([--with-kbd-loadkeys=PATH],
-                [Path to loadkeys]),
-        [KBD_LOADKEYS="$withval"],
-        [KBD_LOADKEYS="/usr/bin/loadkeys"])
-
-AC_ARG_WITH(kbd-setfont,
-        AS_HELP_STRING([--with-kbd-setfont=PATH],
-                [Path to setfont]),
-        [KBD_SETFONT="$withval"],
-        [KBD_SETFONT="/usr/bin/setfont"])
-
-AC_DEFINE_UNQUOTED(KBD_LOADKEYS, ["$KBD_LOADKEYS"], [Path of loadkeys])
-AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont])
-
-AC_SUBST(KBD_LOADKEYS)
-AC_SUBST(KBD_SETFONT)
-
-AC_ARG_WITH(telinit,
-        AS_HELP_STRING([--with-telinit=PATH],
-                [Path to telinit]),
-        [TELINIT="$withval"],
-        [TELINIT="/lib/sysvinit/telinit"])
-
-AC_DEFINE_UNQUOTED(TELINIT, ["$TELINIT"], [Path to telinit])
-
-AC_SUBST(TELINIT)
-
 AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h])
 
 # ------------------------------------------------------------------------------
-have_myhostname=no
-AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))
-if test "x$enable_myhostname" != "xno"; then
-        AC_HEADER_STDC
-        AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h sys/auxv.h])
-
-        AC_C_CONST
-        AC_TYPE_SIZE_T
-        AC_HEADER_TIME
-
-        AC_FUNC_MALLOC
-        AC_FUNC_SELECT_ARGTYPES
-        AC_CHECK_FUNCS([gethostbyaddr gethostbyname gettimeofday inet_ntoa memset select socket strcspn strdup strerror strncasecmp strcasecmp strspn])
-
-        have_myhostname=yes
-fi
-AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
-
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([gudev],
-       AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
-       [], [enable_gudev=yes])
-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]) ])
-AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
-AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
-
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
-       enable_hwdb=$enableval, enable_hwdb=yes)
-AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0],
+                  [have_glib=yes], [have_glib=no])
+AS_IF([test "x$have_glib" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
 
 # ------------------------------------------------------------------------------
 have_manpages=no
@@ -593,12 +538,6 @@ AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])
 AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
 AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
 
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE(hibernate,
-       [AC_HELP_STRING([--disable-hibernate], [disable hibernation support])],
-       enable_hibernate=$enableval, enable_hibernate=yes)
-AM_CONDITIONAL(ENABLE_HIBERNATE, [test x$enable_hibernate = xyes])
-
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE(ldconfig,
        [AC_HELP_STRING([--disable-ldconfig], [disable ldconfig])],
@@ -761,9 +700,6 @@ AC_MSG_RESULT([
         polkit:                  ${have_polkit}
         blkid:                   ${have_blkid}
         dbus:                    ${have_dbus}
-        nss-myhostname:          ${have_myhostname}
-        gudev:                   ${enable_gudev}
-        hwdb:                    ${enable_hwdb}
         kdbus:                   ${have_kdbus}
         Python:                  ${have_python}
         Python Headers:          ${have_python_devel}
@@ -773,7 +709,6 @@ AC_MSG_RESULT([
         Split /usr:              ${enable_split_usr}
         SysV compatibility:      ${SYSTEM_SYSV_COMPAT}
         ldconfig support:        ${enable_ldconfig}
-        hibernate support:       ${enable_hibernate}
         extra debugging:         ${enable_debug}
 
         prefix:                  ${prefix}