removed foreign kpathsea paths

5 files changed, 20 insertions, 22 deletions

diff --git a/include/bounding-box.h b/include/bounding-box.h
index 1f89f8f..d543a98 100644
--- a/include/bounding-box.h
+++ b/include/bounding-box.h
@@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef BOUNDING_BOX_H
 #define BOUNDING_BOX_H
 
-#include <kpathsea/types.h>
+#include "types.h"
 
 
 /* The bounding box's numbers are usually in Cartesian/Metafont
diff --git a/include/global.h b/include/global.h
index cb49189..9899347 100644
--- a/include/global.h
+++ b/include/global.h
@@ -20,10 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#include <kpathsea/lib.h>
-#include <kpathsea/types.h>
+#include "types.h"
 #include "moretypes.h"
-
+#include "lib.h"
 
 /* Define useful abbreviations.  */
 
diff --git a/include/kpathsea-config.h b/include/kpathsea-config.h
index efb4714..08c85f2 100644
--- a/include/kpathsea-config.h
+++ b/include/kpathsea-config.h
@@ -39,31 +39,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #endif /* not WIN32 */
 
 /* System dependencies that are figured out by `configure'.  */
-#include <kpathsea/c-auto.h>
+#include "c-auto.h"
 
 #ifdef __DJGPP__
 #include <fcntl.h>	/* for long filenames' stuff */
 #include <dir.h>	/* for `getdisk' */
 #include <io.h>		/* for `setmode' */
 #endif
-
-#ifdef WIN32
-#include <kpathsea/win32lib.h>
-#endif
  
 /* Some drivers have partially integrated kpathsea changes.  */
 #ifndef KPATHSEA
 #define KPATHSEA 33
 #endif
 
-#include <kpathsea/c-std.h>    /* <stdio.h>, <math.h>, etc.  */
+#include "c-std.h"    /* <stdio.h>, <math.h>, etc.  */
+
+#include "c-proto.h"  /* Macros to discard or keep prototypes.  */
+
 
-#include <kpathsea/c-proto.h>  /* Macros to discard or keep prototypes.  */
+/* not yet added
+ * #include "debug.h"  	
+ */
 
-#include <kpathsea/debug.h>    /* Runtime tracing.  */
-#include <kpathsea/lib.h>      /* STREQ, etc. */
-#include <kpathsea/types.h>    /* <sys/types.h>, boolean, string, etc. */
-#include <kpathsea/progname.h> /* for program_invocation_*name */
+#include "types.h"    /* <sys/types.h>, boolean, string, etc. */
+#include "progname.h" /* for program_invocation_*name */
 
    
 /* If you want to find subdirectories in a directory with non-Unix
diff --git a/include/paths.h b/include/paths.h
index c82235a..087288d 100644
--- a/include/paths.h
+++ b/include/paths.h
@@ -1,10 +1,10 @@
-/* Generated from paths.h.in (Sat Apr 24 17:56:29 PDT 2004).  */
+/* Generated from paths.h.in (Sun May 16 01:43:29 EDT 2004).  */
 /* Paths.  */
 
 /* If the environment variable `FONTUTIL_LIB' isn't set, use this
    path instead to search for auxiliary files.  */ 
 #ifndef DEFAULT_LIB_PATH
-#define DEFAULT_LIB_PATH ".:/u/karl/gnu/src/fontutils/data:/usr/local/lib/fontutil"
+#define DEFAULT_LIB_PATH ".:/home/mjflick/projects/font/fontutils/data:/usr/local/lib/fontutil"
 #endif
 
 /* The meanings of these paths are described in `filename.h'.  They are
diff --git a/include/progname.h b/include/progname.h
index 6902b75..23f7ef6 100644
--- a/include/progname.h
+++ b/include/progname.h
@@ -19,12 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #ifndef KPATHSEA_PROGNAME_H
 #define KPATHSEA_PROGNAME_H
 
-#include <kpathsea/c-proto.h>
-#include <kpathsea/types.h>
+#include "c-proto.h"
+#include "types.h"
 
-extern DllImport string program_invocation_name;
-extern DllImport string program_invocation_short_name;
-extern DllImport string kpse_program_name;
+extern string program_invocation_name;
+extern string program_invocation_short_name;
+extern string kpse_program_name;
 
 /* Set the first two variables above (if they're not predefined) to a copy
    of ARGV0 and everything in ARGV0 after the last directory separator,