configure: enable all extras by default, provide --disable-extras

5 files changed, 11 insertions, 7 deletions

diff --git a/INSTALL b/INSTALL
index 9e24144728..12678a29bf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,9 +31,9 @@ All options:
   --with-selinux
       Link against SELInux libraries to set the expected context
       for created files.
-  --enable-extras
-      Build extras with larger external dependencies like glib,
-      libacl, libusb, ...
+  --disable-extras
+      Disable the build of extras with larger external dependencies
+      like glib, libacl, libusb, ...
 
 The options used in a RPM spec file usually look like:
   --prefix=%{_prefix}
@@ -41,7 +41,6 @@ The options used in a RPM spec file usually look like:
   --sysconfdir=%{_sysconfdir}
   --with-libdir-name=%{_lib}
   --with-selinux
-  --enable-extras
 
 The defined location for scripts and binaries which are called
 from rules is /lib/udev/ on all systems and architectures. Any
diff --git a/README b/README
index d438afae46..3a511802ea 100644
--- a/README
+++ b/README
@@ -38,6 +38,9 @@ Requirements:
     these group names with only the rootfs mounted, and while no network is
     available.
 
+  - To build all udev extras, libacl, libglib2, libusb, usbutils, pciutils are
+    needed. These dependencies can be disabled with the --disable-extras option.
+
 Operation:
   Udev creates and removes device nodes in /dev/, based on events the kernel
   sends out on device discovery or removal.
diff --git a/TODO b/TODO
index da99da4034..d1ae2d7ae3 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+  o CFLAGS debug
+  o cleanup old extras which link libudev source directly
 
   o fix configure options and libdir-name, exec-prefix, udev-prefix, libdir, ...
   o enumerate: sort control* after pcm*
diff --git a/autogen.sh b/autogen.sh
index e41bae05cf..63c1997736 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ CFLAGS="-g -Wall \
 libdirname=$(basename $(cd /lib/$(gcc -print-multi-os-directory); pwd))
 args="--prefix=/usr --exec-prefix= --sysconfdir=/etc \
 --libdir=/usr/$libdirname --with-libdir-name=$libdirname \
---with-selinux --enable-gtk-doc --enable-extras"
+--with-selinux --enable-gtk-doc"
 
 export CFLAGS="$CFLAGS -O2"
 ./configure $args $@
diff --git a/configure.ac b/configure.ac
index 947ab80fd0..bba82ee7bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,8 @@ if test "x$enable_logging" = "xyes"; then
 fi
 
 AC_ARG_ENABLE([extras],
-	AS_HELP_STRING([--enable-extras], [enable extras with external dependencies]),
-	[], [enable_extras=no])
+	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
+	[], [enable_extras=yes])
 if test "x$enable_extras" = xyes; then
 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
 	AC_SUBST([GLIB_CFLAGS])