From 401c5c91b9a33dccc472fd58700a8a9f7f6af8a3 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Tue, 2 Dec 2008 00:14:28 +0100
Subject: [PATCH] Remove last traces of kpathsea library.

---
 config.make.in             |  1 -
 lily/GNUmakefile           |  4 --
 lily/include/kpath.hh      | 17 ---------
 lily/include/lily-guile.hh |  1 -
 stepmake/aclocal.m4        | 78 --------------------------------------
 5 files changed, 101 deletions(-)
 delete mode 100644 lily/include/kpath.hh

diff --git a/config.make.in b/config.make.in
index da0123311f..71530a30c0 100644
--- a/config.make.in
+++ b/config.make.in
@@ -120,7 +120,6 @@ GUILE_LDFLAGS = @GUILE_LDFLAGS@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 INIMETAFONT = @INIMETAFONT@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
 LD = @LD@
 LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@
 LN = @LN@
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 3b13b8a6d9..508020c039 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -19,9 +19,6 @@ OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
 include $(depth)/make/stepmake.make
 
-ifeq ($(HAVE_LIBKPATHSEA_SO),no)
-MODULE_LDFLAGS += $(KPATHSEA_LIBS)
-endif
 ifeq ($(LINK_GXX_STATICALLY),yes)
 MODULE_LDFLAGS += -L$(outdir) -static-libgcc
 endif
@@ -80,7 +77,6 @@ $(outdir)/lexer.cc: $(config_h)
 $(outdir)/parser.cc: $(config_h)
 
 $(outdir)/general-scheme.o: $(outdir)/version.hh
-$(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
 
diff --git a/lily/include/kpath.hh b/lily/include/kpath.hh
deleted file mode 100644
index ddf60094fe..0000000000
--- a/lily/include/kpath.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-  kpath.hh -- declare kpathsea functions.
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
-
-#ifndef KPATH_HH
-#define KPATH_HH
-
-#include "std-string.hh"
-
-string kpathsea_find_tfm (char const *name);
-
-#endif /* KPATH_HH */
-
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index f8f2b0de0d..8c241aeb61 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -151,7 +151,6 @@ SCM ly_unique (SCM lst);
 SCM ly_list_qsort_uniq_x (SCM lst);
 
 SCM ly_output_formats ();
-SCM ly_kpathsea_find_file (SCM);
 
 /*
   snarfing.
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 5d954e67f4..9e386f3922 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -794,84 +794,6 @@ AC_DEFUN(STEPMAKE_INIT, [
 ])
 
     
-AC_DEFUN(STEPMAKE_KPATHSEA, [
-	
-    AC_ARG_WITH(kpathsea-include,
-	[  --with-kpathsea-include=DIR
-	                  location of the kpathsea include dir],[
-	    if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_WARN(Usage: --with-kpathsea-include=includedir)
-	    else
-		CPPFLAGS="$CPPFLAGS -I${withval}"
-	    fi
-	    ])
-    
-    AC_ARG_WITH(kpathsea-lib,
-	[  --with-kpathsea-lib=DIR location of the kpathsea lib dir],[
-	    if test "$withval" = "yes" -o "$withval" = "no"; then
-		AC_MSG_WARN(Usage: --with-kpathsea-lib=libdir)
-	    else
-		LDFLAGS="$LDFLAGS -L${withval}"
-	    fi
-	    ])
-    
-    kpathsea_b=yes
-    AC_ARG_ENABLE(kpathsea,
-    [  --enable-kpathsea         use kpathsea lib.  Default: on],
-    [kpathsea_b=$enableval])
-
-    save_LIBS="$LIBS"
-    if test "$kpathsea_b" != "no"; then	
-	AC_CHECK_HEADERS([kpathsea/kpathsea.h],,kpathsea_b=no)
-	AC_CHECK_LIB(kpathsea, kpse_find_file)
-	AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no)
-	if test "$kpathsea_b" = "no"; then
-	    STEPMAKE_ADD_ENTRY(OPTIONAL, $warn)
-	fi
-    fi
-
-    save_CFLAGS="$CFLAGS"
-    CFLAGS=`echo "-shared $CFLAGS" | sed -e 's/ -g//'`
-    AC_MSG_CHECKING([for shared libkpathsea])
-    AC_TRY_LINK([#include <kpathsea/kpathsea.h>],
-                 [kpse_var_expand ("\$TEXMF");],
-                 [have_libkpathsea_so=maybe;
-		  shared_size=`wc -c conftest$ac_exeext`;
-		  shared_size=`echo $shared_size | sed -e 's/ .*//g'`],
-                 [have_libkpathsea_so=no])
-
-    if test "$have_libkpathsea_so" = "maybe"; then
-	if test "$shared_size" -lt 40000 ; then
-	  have_libkpathsea_so=yes
-	else
-	  have_libkpathsea_so=no
-	fi
-    fi
-    
-    AC_MSG_RESULT($have_libkpathsea_so)
-    if test "$have_libkpathsea_so" = "yes"; then
-	AC_DEFINE(HAVE_LIBKPATHSEA_SO)
-    fi
-    CFLAGS="$save_CFLAGS"
-
-    KPATHSEA_LIBS="$LIBS"
-    LIBS="$save_LIBS"
-    AC_MSG_CHECKING(whether to use kpathsea)
-    if test "$kpathsea_b" != no; then
-        AC_MSG_RESULT(yes)
-	KPATHSEA=1
-    else
-        AC_MSG_RESULT(no)
-	KPATHSEA=0
-    fi
-
-    AC_SUBST(KPATHSEA)
-    AC_SUBST(KPATHSEA_LIBS)
-    AC_SUBST(HAVE_LIBKPATHSEA_SO, $have_libkpathsea_so)
-    AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA)
-])
-
-
 AC_DEFUN(STEPMAKE_LIB, [
     STEPMAKE_PROGS(AR, ar, $1)
     AC_PROG_RANLIB
-- 
2.39.2