[6779] use _AC_OUTPUT_SUBDIRS

[Gavin D. Smith]

Revision: 6779
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6779
Author:   gavin
Date:     2015-11-12 10:46:13 +0000 (Thu, 12 Nov 2015)
Log Message:
-----------
use _AC_OUTPUT_SUBDIRS

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-11-10 19:28:48 UTC (rev 6778)
+++ trunk/ChangeLog     2015-11-12 10:46:13 UTC (rev 6779)
@@ -1,3 +1,8 @@
+2015-11-12  Gavin Smith  <address@hidden>
+
+       * configure.ac: Use _AC_OUTPUT_SUBDIRS macro to configure in 
+       subdirectory.
+
 2015-11-10  Gavin Smith  <address@hidden>
 
        * configure.ac: Handle srcdir being an absolute path for 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2015-11-10 19:28:48 UTC (rev 6778)
+++ trunk/configure.ac  2015-11-12 10:46:13 UTC (rev 6779)
@@ -12,7 +12,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-configure_options="$@"
 AC_INIT([GNU Texinfo], [6.0dev], address@hidden)
 
 dnl Must come before AM_INIT_AUTOMAKE.
@@ -359,15 +358,6 @@
     [ enable_xs=$enableval],
     [ enable_xs=check])
 
-# Pass on all the options we were given to the subsidiary configure 
-# script.
-# Don't use AC_CONFIG_SUBDIRS for this because it isn't done right away,
-# and we need it for the check that follows.
-# We should have some processing of the options here: see 
-# _AC_OUTPUT_SUBDIRS internal autoconf macro in
-# /usr/share/autoconf/autoconf/status.m4.
-#
-
 # Set xs_srcdir to the path from XSParagraph builddir to srcdir
 case $srcdir in
   .)  # We are building in place.
@@ -378,10 +368,18 @@
     xs_srcdir=../../../../$srcdir/tp/Texinfo/Convert/XSParagraph ;;
 esac
 
-(mkdir -p tp/Texinfo/Convert/XSParagraph \
- && cd tp/Texinfo/Convert/XSParagraph \
- && ${xs_srcdir}/configure \
-        --disable-option-checking $configure_options)
+# Pass on all the options we were given to the subsidiary configure 
+# script.
+# Don't use AC_CONFIG_SUBDIRS for this because it isn't done right away,
+# and we need it for the check that follows.
+# We should have some processing of the options here: see 
+# _AC_OUTPUT_SUBDIRS internal autoconf macro in
+# /usr/share/autoconf/autoconf/status.m4.
+#
+save_subdirs=$subdirs
+subdirs=tp/Texinfo/Convert/XSParagraph
+_AC_OUTPUT_SUBDIRS
+subdirs=$save_subdirs
 
 if test $enable_xs = check; then
   AC_MSG_CHECKING([whether we can build Perl extension modules])