texinfo configure.ac tp/MANIFEST tp/Makefile.am...

texinfo-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo configure.ac tp/MANIFEST tp/Makefile.am...

From:	Patrice Dumas
Subject:	texinfo configure.ac tp/MANIFEST tp/Makefile.am...
Date:	Tue, 20 Nov 2012 02:33:44 +0000
CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/11/20 02:33:44

Modified files:
        .              : configure.ac 
        tp             : MANIFEST Makefile.am texi2any.pl 

Log message:
        Do not install modules shipped for portability if they are not used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.146&r2=1.147

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- configure.ac        17 Nov 2012 19:13:37 -0000      1.122
+++ configure.ac        20 Nov 2012 02:33:42 -0000      1.123
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.122 2012/11/17 19:13:37 pertusus Exp $
+# $Id: configure.ac,v 1.123 2012/11/20 02:33:42 pertusus Exp $
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 # Free Software Foundation, Inc.
@@ -244,7 +244,7 @@
 USE_EXTERNAL_EASTASIANWIDTH=no
 AC_ARG_WITH([external-Unicode-EastAsianWidth],
    AC_HELP_STRING([--with-external-Unicode-EastAsianWidth],
-      [use external Unicode-EastAsianWidth if found (default: no)]),
+      [use external Unicode-EastAsianWidth (default: no)]),
    [if test $withval = 'yes'; then
       USE_EXTERNAL_EASTASIANWIDTH=yes
    fi]
@@ -255,7 +255,7 @@
 USE_EXTERNAL_UNIDECODE=no
 AC_ARG_WITH([external-Text-Unidecode],
     AC_HELP_STRING([--with-external-Text-Unidecode],
-           [use external Text::Unidecode if found (default: no)]),
+           [use external Text::Unidecode (default: no)]),
    [if test $withval = 'yes'; then
       USE_EXTERNAL_UNIDECODE=yes
    fi]
@@ -273,7 +273,7 @@
 USE_EXTERNAL_LIBINTL=no
 AC_ARG_WITH([external-libintl-perl],
    AC_HELP_STRING([--with-external-libintl-perl],
-      [use external libintl-perl if found (default: no)]),
+      [use external libintl-perl (default: no)]),
    [if test $withval = 'yes'; then
       USE_EXTERNAL_LIBINTL=yes
    fi]

Index: tp/MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- tp/MANIFEST 11 Nov 2012 16:25:00 -0000      1.49
+++ tp/MANIFEST 20 Nov 2012 02:33:42 -0000      1.50
@@ -458,6 +458,8 @@
 t/results/coverage/punctuation_in_line_commands.pl
 t/results/coverage/quotation_author.pl
 t/results/coverage/setfilename_in_paragraph.pl
+t/results/coverage/spaces_after_braced_command.pl
+t/results/coverage/spaces_no_brace_after_braced_command.pl
 t/results/coverage/symbol_after_block.pl
 t/results/coverage/symbol_after_command.pl
 t/results/coverage/table.pl
@@ -1248,6 +1250,7 @@
 t/results/value/empty_set.pl
 t/results/value/empty_value_in_line.pl
 t/results/value/simple.pl
+t/results/value/spaces_before_value.pl
 t/results/value/value_after_accent.pl
 t/results/value/value_in_index_commands.pl
 t/results/value/value_in_invalid_documentencoding.pl

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- tp/Makefile.am      16 Nov 2012 18:33:03 -0000      1.49
+++ tp/Makefile.am      20 Nov 2012 02:33:42 -0000      1.50
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.49 2012/11/16 18:33:03 karl Exp $
+# $Id: Makefile.am,v 1.50 2012/11/20 02:33:42 pertusus Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011, 2012 Free Software Foundation, Inc.
@@ -211,22 +211,28 @@
 libsrcdir = $(srcdir)/maintain/lib
 
 install-data-local:
+       if test $(USE_EXTERNAL_LIBINTL) != 'yes' ; then \
        $(mkdir_p) $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode \
-         $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
+           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData; \
        $(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/*.pm \
-         $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale
+           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale; \
        $(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/Recode/*.pm \
-         $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode
+           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/Recode; \
        $(INSTALL_DATA) $(libsrcdir)/libintl-perl/lib/Locale/RecodeData/*.pm \
-         $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData
-       $(mkdir_p) 
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
+           $(DESTDIR)$(pkgdatadir)/lib/libintl-perl/lib/Locale/RecodeData; \
+       fi
+       if test $(USE_EXTERNAL_EASTASIANWIDTH) != 'yes' ; then \
+         $(mkdir_p) 
$(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode; \
        $(INSTALL_DATA) 
$(libsrcdir)/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm \
-        $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode
-       $(mkdir_p) $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode
+          $(DESTDIR)$(pkgdatadir)/lib/Unicode-EastAsianWidth/lib/Unicode; \
+       fi
+       if test $(USE_EXTERNAL_UNIDECODE) != 'yes' ; then \
+         $(mkdir_p) 
$(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode; \
        $(INSTALL_DATA) $(libsrcdir)/Text-Unidecode/lib/Text/Unidecode.pm \
-         $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text
+           $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text; \
        $(INSTALL_DATA) $(libsrcdir)/Text-Unidecode/lib/Text/Unidecode/*.pm \
-         $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode
+           $(DESTDIR)$(pkgdatadir)/lib/Text-Unidecode/lib/Text/Unidecode; \
+       fi
 
 install-exec-hook:
        -$(LN_S) texi2any $(DESTDIR)$(bindir)/makeinfo

Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- tp/texi2any.pl      19 Nov 2012 20:13:38 -0000      1.146
+++ tp/texi2any.pl      20 Nov 2012 02:33:43 -0000      1.147
@@ -67,8 +67,8 @@
   }
   # try to make package relocatable, will only work if standard relative paths
   # are used
-  if ((!defined($texinfolibdir)
-       or ! -f File::Spec->catfile($texinfolibdir, 'Texinfo', 'Parser.pm'))
+  if ((defined($texinfolibdir)
+       and ! -f File::Spec->catfile($texinfolibdir, 'Texinfo', 'Parser.pm'))
       and -f File::Spec->catfile($command_directory, $updir, 'share', 
'texinfo', 'Texinfo', 'Parser.pm')) {
     unshift @INC, (File::Spec->catdir($command_directory, $updir, 'share', 
'texinfo'));
   }
@@ -98,7 +98,7 @@
     }
   }
   # try to make the script relocatable
-  if (!defined($texinfolibdir) and $configure_string ne 'yes') {
+  if (defined($texinfolibdir) and $configure_string ne 'yes') {
     eval "require $module_name; ";
     if ($@ and -d File::Spec->catdir($command_directory, $updir, 
                                     'share', 'texinfo', @directories)) {
[Prev in Thread]
Current Thread
[Next in Thread]
texinfo configure.ac tp/MANIFEST tp/Makefile.am..., Patrice Dumas <=
Prev by Date: texinfo doc/texinfo.txi ChangeLog tp/Texinfo/Co...
Next by Date: texinfo Pod-Simple-Texinfo/pod2texi.pl util/txi...
Previous by thread: texinfo doc/texinfo.txi ChangeLog tp/Texinfo/Co...
Next by thread: texinfo Pod-Simple-Texinfo/pod2texi.pl util/txi...
Index(es):
- Date
- Thread