[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6778] handle absolute srcdir
From: |
Gavin D. Smith |
Subject: |
[6778] handle absolute srcdir |
Date: |
Tue, 10 Nov 2015 19:28:50 +0000 |
Revision: 6778
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6778
Author: gavin
Date: 2015-11-10 19:28:48 +0000 (Tue, 10 Nov 2015)
Log Message:
-----------
handle absolute srcdir
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-11-10 16:34:37 UTC (rev 6777)
+++ trunk/ChangeLog 2015-11-10 19:28:48 UTC (rev 6778)
@@ -1,5 +1,11 @@
2015-11-10 Gavin Smith <address@hidden>
+ * configure.ac: Handle srcdir being an absolute path for
+ building in XSParagraph subdirectory. Used code from Autoconf's
+ _AC_SRCDIRS macro (release 2.69).
+
+2015-11-10 Gavin Smith <address@hidden>
+
* README-hacking: Add hints about the interdependencies between
subdirectories.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2015-11-10 16:34:37 UTC (rev 6777)
+++ trunk/configure.ac 2015-11-10 19:28:48 UTC (rev 6778)
@@ -367,9 +367,20 @@
# _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.
+ xs_srcdir=. ;;
+ [[\\/]]* | ?:[[\\/]]* ) # Absolute name.
+ xs_srcdir=$srcdir/tp/Texinfo/Convert/XSParagraph ;;
+ *) # Relative name.
+ xs_srcdir=../../../../$srcdir/tp/Texinfo/Convert/XSParagraph ;;
+esac
+
(mkdir -p tp/Texinfo/Convert/XSParagraph \
&& cd tp/Texinfo/Convert/XSParagraph \
- && ../../../../${srcdir}/tp/Texinfo/Convert/XSParagraph/configure \
+ && ${xs_srcdir}/configure \
--disable-option-checking $configure_options)
if test $enable_xs = check; then
@@ -379,8 +390,8 @@
&& make clean \
&& make TestXS.la \
&& ${PERL} -I . \
- -I ../../../../${srcdir}/tp/Texinfo/Convert/XSParagraph \
- -w ../../../../${srcdir}/tp/Texinfo/Convert/XSParagraph/fail.pl \
+ -I ${xs_srcdir} \
+ -w ${xs_srcdir}/fail.pl \
| grep 'message from XS module') >/dev/null \
&& enable_xs=yes
AC_MSG_RESULT([$enable_xs])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6778] handle absolute srcdir,
Gavin D. Smith <=