summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-14 13:32:10 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-03-14 13:32:10 +0000
commit320806c04be3fba38b75ff06979e45316ce84047 (patch)
tree1fcf033704e388683d6e8133a33dd2303ec8ce9a /Build
parent2069d48ccbd0a68b9889261b7a474f54faf1206b (diff)
texk/kpathsea: Install <kpathsea/c-auto.h> in an architecture dependent location
git-svn-id: svn://tug.org/texlive/trunk@36510 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/Makefile.am6
-rw-r--r--Build/source/texk/kpathsea/Makefile.in62
-rw-r--r--Build/source/texk/kpathsea/NEWS6
-rw-r--r--Build/source/texk/kpathsea/kpathsea.pc.in2
-rw-r--r--Build/source/texk/web2c/ChangeLog4
-rwxr-xr-xBuild/source/texk/web2c/configure48
-rw-r--r--Build/source/texk/web2c/configure.ac48
8 files changed, 108 insertions, 73 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 656b42ce232..18ee908215a 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, kpathsea.pc.in: Install <kpathsea/c-auto.h> under
+ ${libdir}.
+
2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Drop checks for strcasecmp, strtol, and strstr.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index e72d1037b56..aaea3ed6321 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -111,10 +111,14 @@ EXTRA_DIST += \
kpseincludedir = ${includedir}/kpathsea
nodist_kpseinclude_HEADERS = \
- c-auto.h \
kpathsea.h \
paths.h
+kpselibincludedir = ${libdir}/kpathsea
+
+nodist_kpselibinclude_HEADERS = \
+ c-auto.h
+
kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers)
# Headers included directly into kpathsea.h
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 92a7cb88c3b..8b0119557a2 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -172,7 +172,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" \
- "$(DESTDIR)$(kpseincludedir)"
+ "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS)
am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.c \
@@ -307,7 +307,7 @@ am__can_run_installinfo = \
esac
DATA = $(dist_noinst_DATA) $(dist_web2c_DATA) $(pkgconfig_DATA)
HEADERS = $(kpseinclude_HEADERS) $(nodist_kpseinclude_HEADERS) \
- $(noinst_HEADERS)
+ $(nodist_kpselibinclude_HEADERS) $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -716,10 +716,13 @@ libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.c \
$(am__append_5) $(am__append_7)
kpseincludedir = ${includedir}/kpathsea
nodist_kpseinclude_HEADERS = \
- c-auto.h \
kpathsea.h \
paths.h
+kpselibincludedir = ${libdir}/kpathsea
+nodist_kpselibinclude_HEADERS = \
+ c-auto.h
+
kpseinclude_HEADERS = config.h $(direct_headers) $(indirect_headers)
# Headers included directly into kpathsea.h
@@ -1618,6 +1621,27 @@ uninstall-nodist_kpseincludeHEADERS:
@list='$(nodist_kpseinclude_HEADERS)'; test -n "$(kpseincludedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(kpseincludedir)'; $(am__uninstall_files_from_dir)
+install-nodist_kpselibincludeHEADERS: $(nodist_kpselibinclude_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(nodist_kpselibinclude_HEADERS)'; test -n "$(kpselibincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(kpselibincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(kpselibincludedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(kpselibincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(kpselibincludedir)" || exit $$?; \
+ done
+
+uninstall-nodist_kpselibincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_kpselibinclude_HEADERS)'; test -n "$(kpselibincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(kpselibincludedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@@ -2079,7 +2103,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(web2cdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpselibincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -2145,7 +2169,8 @@ info-am:
install-data-am: install-data-local install-dist_web2cDATA \
install-dist_web2cSCRIPTS install-kpseincludeHEADERS \
- install-nodist_kpseincludeHEADERS install-pkgconfigDATA
+ install-nodist_kpseincludeHEADERS \
+ install-nodist_kpselibincludeHEADERS install-pkgconfigDATA
install-dvi: install-dvi-recursive
@@ -2198,7 +2223,8 @@ ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
uninstall-dist_web2cSCRIPTS uninstall-kpseincludeHEADERS \
uninstall-libLTLIBRARIES uninstall-local \
- uninstall-nodist_kpseincludeHEADERS uninstall-pkgconfigDATA
+ uninstall-nodist_kpseincludeHEADERS \
+ uninstall-nodist_kpselibincludeHEADERS uninstall-pkgconfigDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
.MAKE: $(am__recursive_targets) all check check-am install install-am \
@@ -2219,17 +2245,19 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
install-exec-local install-html install-html-am install-info \
install-info-am install-kpseincludeHEADERS \
install-libLTLIBRARIES install-man \
- install-nodist_kpseincludeHEADERS install-pdf install-pdf-am \
- install-pkgconfigDATA install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-dist_web2cDATA \
- uninstall-dist_web2cSCRIPTS uninstall-hook \
- uninstall-kpseincludeHEADERS uninstall-libLTLIBRARIES \
- uninstall-local uninstall-nodist_kpseincludeHEADERS \
- uninstall-pkgconfigDATA
+ install-nodist_kpseincludeHEADERS \
+ install-nodist_kpselibincludeHEADERS install-pdf \
+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
+ uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-dist_web2cDATA uninstall-dist_web2cSCRIPTS \
+ uninstall-hook uninstall-kpseincludeHEADERS \
+ uninstall-libLTLIBRARIES uninstall-local \
+ uninstall-nodist_kpseincludeHEADERS \
+ uninstall-nodist_kpselibincludeHEADERS uninstall-pkgconfigDATA
.PRECIOUS: Makefile
diff --git a/Build/source/texk/kpathsea/NEWS b/Build/source/texk/kpathsea/NEWS
index 9f07c014e24..00c85b444e2 100644
--- a/Build/source/texk/kpathsea/NEWS
+++ b/Build/source/texk/kpathsea/NEWS
@@ -1,9 +1,11 @@
This file records noteworthy changes. (Public domain.)
-(for TeX Live 2015)
+6.2.1 (for TeX Live 2015)
* kpsewhich --help outputs more information the search paths.
+* install <kpatsea/c-auto.h> in an architecture dependent location
+ and use pkg-config to get the required flags.
-6.2.0 (for TeX Live 2014)
+6.2.0 (for TeX Live 2014, 30 May 2013)
* mktexlsr outputs normal msgs to stdout instead of stderr.
* do not ignore a non-terminated last line of a file.
* new texmf.cnf variables SELFAUTOGRANDPARENT, guess_input_kanji_encoding.
diff --git a/Build/source/texk/kpathsea/kpathsea.pc.in b/Build/source/texk/kpathsea/kpathsea.pc.in
index 865f5408ab5..63ac7724177 100644
--- a/Build/source/texk/kpathsea/kpathsea.pc.in
+++ b/Build/source/texk/kpathsea/kpathsea.pc.in
@@ -7,5 +7,5 @@ Name: kpathsea
Description: Kpathsea filename lookup library
Version: @KPSEVERSION@
Libs: -L${libdir} -lkpathsea
-Cflags: -I${includedir}
+Cflags: -I${libdir} -I${includedir}
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index c18e27888f1..8ff49ad81d9 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Correctly locate installed <kpathsea/paths.h>.
+
2015-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* w2c/config.h: Drop the strtol() prototype.
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index d142512ce3f..bf2a1d580b9 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -650,6 +650,7 @@ CTANGLE
CTANGLEBOOT
TANGLE
TANGLEBOOT
+KPATHSEA_PATHS_H
HARFBUZZ_RULE
HARFBUZZ_DEPEND
HARFBUZZ_LIBS
@@ -729,7 +730,6 @@ LEX_OUTPUT_ROOT
LEX
YFLAGS
YACC
-KPATHSEA_PATHS_H
UPWEB_FALSE
UPWEB_TRUE
PWEB_FALSE
@@ -21044,31 +21044,6 @@ else
fi
-if test "x$with_system_kpathsea" = xyes; then
- if test "x$with_kpathsea_includes" = x; then
- list="/usr/include /usr/local/include"
- else
- list=$with_kpathsea_includes
- fi
- found=no
- for KPATHSEA_PATHS_H in $list; do
- if test -r "$KPATHSEA_PATHS_H/kpathsea/paths.h"; then
- found=yes
- break
- fi
- done
- if test "x$found" = xno; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: You requested to build \`web2c' using an installed \`kpathsea' version," >&5
-$as_echo "$as_me: You requested to build \`web2c' using an installed \`kpathsea' version," >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: which requires to locate the <kpathsea/paths.h> header file." >&5
-$as_echo "$as_me: which requires to locate the <kpathsea/paths.h> header file." >&6;}
- as_fn_error $? "Sorry, not found under any of: $list *****" "$LINENO" 5
- fi
-else
- KPATHSEA_PATHS_H='${top_builddir}/..'
-fi
-
-
for ac_prog in 'bison -y' byacc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -24342,6 +24317,27 @@ _ACEOF
+if test "x$with_system_kpathsea" = xyes; then
+ list="/usr/include /usr/local/include `echo $KPATHSEA_INCLUDES | sed 's/-I//g'`"
+ found=no
+ for KPATHSEA_PATHS_H in $list; do
+ if test -r "$KPATHSEA_PATHS_H/kpathsea/paths.h"; then
+ found=yes
+ break
+ fi
+ done
+ if test "x$found" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: You requested to build \`web2c' using an installed \`kpathsea' version," >&5
+$as_echo "$as_me: You requested to build \`web2c' using an installed \`kpathsea' version," >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: which requires to locate the <kpathsea/paths.h> header file." >&5
+$as_echo "$as_me: which requires to locate the <kpathsea/paths.h> header file." >&6;}
+ as_fn_error $? "Sorry, not found under any of: $list *****" "$LINENO" 5
+ fi
+else
+ KPATHSEA_PATHS_H='${top_builddir}/..'
+fi
+
+
# Check of poppler 0.25 or better
case $with_system_poppler in #(
yes) :
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 90e813aa169..72c2911ba5f 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -207,32 +207,6 @@ AS_IF([test "x$enable_uptex:$enable_euptex" = xno:no],
[enable_upweb_progs=$enable_web_progs])
AM_CONDITIONAL([UPWEB], [test "x$enable_upweb_progs" != xno])
-dnl Although quite unusual, it is possible to build Web2C (TeX & Co)
-dnl using installed (system) kpathsea headers and library.
-dnl In that case we need the location of <kpathsea/paths.h>.
-if test "x$with_system_kpathsea" = xyes; then
- if test "x$with_kpathsea_includes" = x; then
- list="/usr/include /usr/local/include"
- else
- list=$with_kpathsea_includes
- fi
- found=no
- for KPATHSEA_PATHS_H in $list; do
- if test -r "$KPATHSEA_PATHS_H/kpathsea/paths.h"; then
- found=yes
- break
- fi
- done
- if test "x$found" = xno; then
- AC_MSG_NOTICE([You requested to build `web2c' using an installed `kpathsea' version,])
- AC_MSG_NOTICE([ which requires to locate the <kpathsea/paths.h> header file.])
- AC_MSG_ERROR([Sorry, not found under any of: $list *****])
- fi
-else
- KPATHSEA_PATHS_H='${top_builddir}/..'
-fi
-AC_SUBST([KPATHSEA_PATHS_H])
-
AC_PROG_YACC
KPSE_PROG_LEX
@@ -287,6 +261,28 @@ KPSE_ADD_FLAGS([kpathsea])
AC_CHECK_SIZEOF([off_t], , AC_INCLUDES_DEFAULT
[#include <kpathsea/config.h>])
+if test "x$with_system_kpathsea" = xyes; then
+dnl Although quite unusual, it is possible to build Web2C (TeX & Co)
+dnl using installed (system) kpathsea headers and library.
+dnl In that case we need the location of <kpathsea/paths.h>.
+ list="/usr/include /usr/local/include `echo $KPATHSEA_INCLUDES | sed 's/-I//g'`"
+ found=no
+ for KPATHSEA_PATHS_H in $list; do
+ if test -r "$KPATHSEA_PATHS_H/kpathsea/paths.h"; then
+ found=yes
+ break
+ fi
+ done
+ if test "x$found" = xno; then
+ AC_MSG_NOTICE([You requested to build `web2c' using an installed `kpathsea' version,])
+ AC_MSG_NOTICE([ which requires to locate the <kpathsea/paths.h> header file.])
+ AC_MSG_ERROR([Sorry, not found under any of: $list *****])
+ fi
+else
+ KPATHSEA_PATHS_H='${top_builddir}/..'
+fi
+AC_SUBST([KPATHSEA_PATHS_H])
+
# Check of poppler 0.25 or better
AS_CASE([$with_system_poppler],
[yes], [dnl