summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-10 09:13:50 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-03-10 09:13:50 +0000
commitd52c80bbd7d9a4255f54d34929e6d06f18a1d6d5 (patch)
tree96acc5581e382f29613e8aeebbae87dcdca0c781 /Build/source/texk/dvipng
parent7b1fe9c5919e7d7ddff71b621137cb798e1aa5b1 (diff)
avoid use of and remove support for kpse_set_progname,
should be completely removed for kpathsea version 6.x.y git-svn-id: svn://tug.org/texlive/trunk@17409 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipng')
-rw-r--r--Build/source/texk/dvipng/ChangeLog5
-rwxr-xr-xBuild/source/texk/dvipng/configure4
-rw-r--r--Build/source/texk/dvipng/configure.ac2
-rw-r--r--Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog5
-rw-r--r--Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-12-set_program_name26
-rw-r--r--Build/source/texk/dvipng/dvipng-1.12/ChangeLog5
-rw-r--r--Build/source/texk/dvipng/dvipng-1.12/configure.ac2
7 files changed, 45 insertions, 4 deletions
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index ff1e5a6fb3b..ddbbc34b370 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Check for kpse_set_program_name() as used in
+ dvipng.c instead of kpse_set_progname().
+
2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac, help/Makefile.am: Do not even try to rebuild
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 804d459b4fa..aa1217d4da3 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -15433,8 +15433,8 @@ fi
eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\"
eval LIBS=\"$KPATHSEA_LIBS \$LIBS\"
-ac_fn_c_check_func "$LINENO" "kpse_set_progname" "ac_cv_func_kpse_set_progname"
-if test "x$ac_cv_func_kpse_set_progname" = x""yes; then :
+ac_fn_c_check_func "$LINENO" "kpse_set_program_name" "ac_cv_func_kpse_set_program_name"
+if test "x$ac_cv_func_kpse_set_program_name" = x""yes; then :
$as_echo "#define HAVE_LIBKPATHSEA 1" >>confdefs.h
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 8d6db35beac..53af4e5b689 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -138,7 +138,7 @@ AC_CHECK_FUNC([gdImageCreate],
This drawing library can be downloaded at http://www.boutell.com/gd])])
KPSE_ADD_FLAGS([kpathsea])
-AC_CHECK_FUNC([kpse_set_progname],
+AC_CHECK_FUNC([kpse_set_program_name],
[AC_DEFINE([HAVE_LIBKPATHSEA], 1,
[Define to 1 if you have the `kpathsea' library (-lkpathsea).])],
[AC_MSG_ERROR([cannot find/use libkpathsea])])
diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog
index f076d87063a..91100698f24 100644
--- a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-12-set_program_name: Replace kpse_set_progname() by
+ kpse_set_program_name().
+
2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-10-mmap-for-WIN32 (new): Former MIKTEX code for mmap
diff --git a/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-12-set_program_name b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-12-set_program_name
new file mode 100644
index 00000000000..4225fff4f98
--- /dev/null
+++ b/Build/source/texk/dvipng/dvipng-1.12-PATCHES/patch-12-set_program_name
@@ -0,0 +1,26 @@
+ Replace kpse_set_progname() by kpse_set_program_name().
+
+diff -ur dvipng-1.12.orig/ChangeLog dvipng-1.12/ChangeLog
+--- dvipng-1.12.orig/ChangeLog 2010-02-24 17:29:03.000000000 +0100
++++ dvipng-1.12/ChangeLog 2010-03-09 18:53:23.800798994 +0100
+@@ -1,3 +1,8 @@
++2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de>
++
++ * configure.ac: Check for kpse_set_program_name() as used in
++ dvipng.c instead of kpse_set_progname().
++
+ 2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Support WIN32 builds (native or MinGW32).
+diff -ur dvipng-1.12.orig/configure.ac dvipng-1.12/configure.ac
+--- dvipng-1.12.orig/configure.ac 2009-02-23 14:47:03.000000000 +0100
++++ dvipng-1.12/configure.ac 2010-03-09 18:50:33.116303898 +0100
+@@ -69,7 +69,7 @@
+ AC_CHECK_LIB([gd], [gdImageCreate],,
+ [AC_MSG_ERROR([cannot find/use libgd
+ This drawing library can be downloaded at http://www.boutell.com/gd])])
+-AC_CHECK_LIB([kpathsea], [kpse_set_progname],,
++AC_CHECK_LIB([kpathsea], [kpse_set_program_name],,
+ AC_MSG_ERROR([cannot find/use libkpathsea]))
+ AC_CHECK_LIB([t1], [T1_InitLib])
+ PSFONTS_O=""
diff --git a/Build/source/texk/dvipng/dvipng-1.12/ChangeLog b/Build/source/texk/dvipng/dvipng-1.12/ChangeLog
index be4403114cd..4336c507b8d 100644
--- a/Build/source/texk/dvipng/dvipng-1.12/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-1.12/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Check for kpse_set_program_name() as used in
+ dvipng.c instead of kpse_set_progname().
+
2010-02-24 Peter Breitenlohner <peb@mppmu.mpg.de>
Support WIN32 builds (native or MinGW32).
diff --git a/Build/source/texk/dvipng/dvipng-1.12/configure.ac b/Build/source/texk/dvipng/dvipng-1.12/configure.ac
index 509591c93ba..751087a1f49 100644
--- a/Build/source/texk/dvipng/dvipng-1.12/configure.ac
+++ b/Build/source/texk/dvipng/dvipng-1.12/configure.ac
@@ -69,7 +69,7 @@ AC_CHECK_LIB([png], [png_read_image],,
AC_CHECK_LIB([gd], [gdImageCreate],,
[AC_MSG_ERROR([cannot find/use libgd
This drawing library can be downloaded at http://www.boutell.com/gd])])
-AC_CHECK_LIB([kpathsea], [kpse_set_progname],,
+AC_CHECK_LIB([kpathsea], [kpse_set_program_name],,
AC_MSG_ERROR([cannot find/use libkpathsea]))
AC_CHECK_LIB([t1], [T1_InitLib])
PSFONTS_O=""