summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-16 07:44:41 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-05-16 07:44:41 +0000
commit6d4bec0e385c830d33134c540b04adf42b57aebc (patch)
treea7aa87445eb71eb42d96f1fb993a7822f5decf59
parentb4de05961b642a8957b4c3f668fcaabbebc9722b (diff)
kpathsea: reexport kpathsea_cnf_get() and install <kpathsea/cnf.h>
git-svn-id: svn://tug.org/texlive/trunk@26437 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/Makefile.am2
-rw-r--r--Build/source/texk/kpathsea/Makefile.in2
-rw-r--r--Build/source/texk/kpathsea/cnf.c9
-rw-r--r--Build/source/texk/kpathsea/cnf.h8
5 files changed, 21 insertions, 6 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index cc38fb4c8d5..2e97d683f5e 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-16 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * cnf.[ch]: Add KPSEDLL to kpathsea_cnf_get(), and reintroduce
+ kpse_cnf_get().
+ * Makefile.am: Do install cnf.h.
+
2012-05-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (rebuild): Depend on 'all-am' instead of 'all' to
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index f544dc046bf..a80fc85b9b0 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -138,6 +138,7 @@ normal_headers = \
c-stat.h \
c-std.h \
c-unistd.h \
+ cnf.h \
concatn.h \
debug.h \
expand.h \
@@ -162,7 +163,6 @@ normal_headers = \
version.h
noinst_HEADERS = \
- cnf.h \
db.h \
default.h \
fn.h \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 0a3ac1c4472..b02fb232e8c 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -462,6 +462,7 @@ normal_headers = \
c-stat.h \
c-std.h \
c-unistd.h \
+ cnf.h \
concatn.h \
debug.h \
expand.h \
@@ -486,7 +487,6 @@ normal_headers = \
version.h
noinst_HEADERS = \
- cnf.h \
db.h \
default.h \
fn.h \
diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c
index 97cf02d6a93..1f9dc744c88 100644
--- a/Build/source/texk/kpathsea/cnf.c
+++ b/Build/source/texk/kpathsea/cnf.c
@@ -271,3 +271,12 @@ kpathsea_cnf_get (kpathsea kpse, const_string name)
return ret;
}
+
+#if defined(KPSE_COMPAT_API)
+string
+kpse_cnf_get (const_string name)
+{
+ return kpathsea_cnf_get(kpse_def, name);
+}
+#endif
+
diff --git a/Build/source/texk/kpathsea/cnf.h b/Build/source/texk/kpathsea/cnf.h
index 45f95f9aebf..4d653f4197e 100644
--- a/Build/source/texk/kpathsea/cnf.h
+++ b/Build/source/texk/kpathsea/cnf.h
@@ -19,8 +19,6 @@
#ifndef KPATHSEA_CNF_H
#define KPATHSEA_CNF_H
-#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
-
#include <kpathsea/c-proto.h>
#include <kpathsea/types.h>
@@ -28,8 +26,10 @@
On the first call, also read all the `texmf.cnf' files in the
path for kpse_cnf_format (and initialize the path). */
-extern string kpathsea_cnf_get (kpathsea kpse, const_string name);
+extern KPSEDLL string kpathsea_cnf_get (kpathsea kpse, const_string name);
-#endif /* MAKE_KPSE_DLL */
+#if defined(KPSE_COMPAT_API)
+extern KPSEDLL string kpse_cnf_get (const_string var);
+#endif
#endif /* not KPATHSEA_CNF_H */