From 236bfeeaa3440e157fe7f4a07a16264441ad1f0b Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Mon, 24 Sep 2012 15:39:52 -0400
Subject: [PATCH] revert 2dc709981b3084a071cc22cd3b56c0ec61296080

---
 configure.in | 68 ++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/configure.in b/configure.in
index 9fa01e4aba..5a97b86ace 100644
--- a/configure.in
+++ b/configure.in
@@ -330,11 +330,6 @@ if test "x${enable_visibility}" != "xno" ; then
 	fi
 fi
 
-# Option to skip configuration of subdirectories
-AC_ARG_ENABLE(skip-subdirectories,
-[AC_HELP_STRING([--enable-skip-subdirectories],[skip configuration of subdirectories])],
-[enable_skip_subdirectories="$enableval"],[enable_skip_subdirectories="no"])
-
 # Enable debugging (default: on)
 # (rename option if the default is changed)
 AC_ARG_ENABLE(debug,
@@ -1074,40 +1069,39 @@ ac_configure_args="$ac_configure_args CONFIGURE_CFLAGS='$CFLAGS' CONFIGURE_CXXFL
 #	--localstatedir='$localstatedir' --datadir='$datadir'"
 
 # Run configure in all the subdirs
-if ! test "${enable_skip_subdirectories}" = "yes"; then
-   AC_CONFIG_SUBDIRS([libs/srtp])
-   AC_CONFIG_SUBDIRS([libs/sqlite])
-   if test "$enable_core_libedit_support" = "yes" ; then
-      AC_CONFIG_SUBDIRS([libs/libedit])
-   fi
-   AC_CONFIG_SUBDIRS([libs/pcre])
-   AC_CONFIG_SUBDIRS([libs/apr])
-   AC_CONFIG_SUBDIRS([libs/apr-util])
-   AC_CONFIG_SUBDIRS([libs/ilbc])
-   AC_CONFIG_SUBDIRS([libs/curl])
-   AC_CONFIG_SUBDIRS([libs/iksemel])
-   AC_CONFIG_SUBDIRS([libs/js/nsprpub])
-   AC_CONFIG_SUBDIRS([libs/js])
-   AC_CONFIG_SUBDIRS([libs/libdingaling])
-   AC_CONFIG_SUBDIRS([libs/libsndfile])
-   AC_CONFIG_SUBDIRS([libs/sofia-sip])
-   AC_CONFIG_SUBDIRS([libs/speex])
-   AC_CONFIG_SUBDIRS([libs/portaudio])
-   AC_CONFIG_SUBDIRS([libs/openzap])
-   AC_CONFIG_SUBDIRS([libs/freetdm])
-   AC_CONFIG_SUBDIRS([libs/unimrcp])
-   AC_CONFIG_SUBDIRS([libs/tiff-4.0.2])
-   AC_CONFIG_SUBDIRS([libs/spandsp])
-   AC_CONFIG_SUBDIRS([libs/broadvoice])
-   AC_CONFIG_SUBDIRS([libs/libg722_1])
-   AC_CONFIG_SUBDIRS([libs/silk])
-   AC_CONFIG_SUBDIRS([libs/libcodec2])
-   if test "x${enable_zrtp}" = "xyes"; then
-      AC_CONFIG_SUBDIRS([libs/libzrtp/projects/gnu])
-   fi
-   AC_CONFIG_SUBDIRS([libs/libwebsockets])
+AC_CONFIG_SUBDIRS([libs/srtp])
+AC_CONFIG_SUBDIRS([libs/sqlite])
+if test "$enable_core_libedit_support" = "yes" ; then
+    AC_CONFIG_SUBDIRS([libs/libedit])
 fi
 
+AC_CONFIG_SUBDIRS([libs/pcre])
+AC_CONFIG_SUBDIRS([libs/apr])
+AC_CONFIG_SUBDIRS([libs/apr-util])
+AC_CONFIG_SUBDIRS([libs/ilbc])
+AC_CONFIG_SUBDIRS([libs/curl])
+AC_CONFIG_SUBDIRS([libs/iksemel])
+AC_CONFIG_SUBDIRS([libs/js/nsprpub])
+AC_CONFIG_SUBDIRS([libs/js])
+AC_CONFIG_SUBDIRS([libs/libdingaling])
+AC_CONFIG_SUBDIRS([libs/libsndfile])
+AC_CONFIG_SUBDIRS([libs/sofia-sip])
+AC_CONFIG_SUBDIRS([libs/speex])
+AC_CONFIG_SUBDIRS([libs/portaudio])
+AC_CONFIG_SUBDIRS([libs/openzap])
+AC_CONFIG_SUBDIRS([libs/freetdm])
+AC_CONFIG_SUBDIRS([libs/unimrcp])
+AC_CONFIG_SUBDIRS([libs/tiff-4.0.2])
+AC_CONFIG_SUBDIRS([libs/spandsp])
+AC_CONFIG_SUBDIRS([libs/broadvoice])
+AC_CONFIG_SUBDIRS([libs/libg722_1])
+AC_CONFIG_SUBDIRS([libs/silk])
+AC_CONFIG_SUBDIRS([libs/libcodec2])
+if test "x${enable_zrtp}" = "xyes"; then
+   AC_CONFIG_SUBDIRS([libs/libzrtp/projects/gnu])
+fi
+AC_CONFIG_SUBDIRS([libs/libwebsockets])
+
 case $host in
    *-openbsd*)
        # libtool won't link static libs against shared ones on OpenBSD unless we tell it not to be stupid