fixes to get old Makefiles working again,

   and to make them work without libltdl dependencies (i.e. no dynamic laoding)

diff --git a/Config.mk b/Config.mk
index cdba1bb293073dc24dc87e18508ca62e72f10b17..d4485c578db597d22e1acdc388e79a62d1fa7600 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -20,7 +20,7 @@ EXPAT_LIB = -lexpat
 
 # specify where to find bitmap packages (See INSTALL file.)
 EXTLIB_INC=-I/usr/include/freetype2
-EXTLIB_LIB=-ljpeg -lpng -lfreetype -lz
+EXTLIB_LIB=-ljpeg -lpng -lfontconfig -lfreetype -lz
 
 ###################################################
 #  Typically, nothing below should be changed.    #
@@ -51,3 +51,10 @@ TK_LIBDIR=$(TKDIR)/lib
 # location of tk.h
 TK_INCDIR=$(TKDIR)/include
 
+VERSION=2.3
+VERSION=2.3
+VERSION=2.3
+VERSION=2.3
+VERSION=2.3
+VERSION=2.3
+VERSION=2.3

diff --git a/config.h.old b/config.h.old
index 541351975d01e3251756f6c25d2399a4c810c56b..73f652f480e26ad705a6bcc1cb2e655aaa6656ab 100644 (file)
--- a/config.h.old
+++ b/config.h.old
@@ -115,10 +115,10 @@
 #define ENABLE_CODEGENS 1
 
 /* Define if you don't want on-demand plugin loading */
-/* #define DISABLE_LTDL 1 */
+#define DISABLE_LTDL 1
 
 /* Set if you want the new gvrender codegens */
-#define ENABLE_GVRENDER 0
+#define ENABLE_GVRENDER 1
 
 /* Define if you want the gd renderers (png, gif, etc ) */
 #define GD_RENDER 1

diff --git a/lib/gvc/Makefile.old b/lib/gvc/Makefile.old
index 480abcbab4021d0b530819f33e272c743b1a6ae8..4792e14047de3129e7577e2ed09bc0e3efa52fc0 100644 (file)
--- a/lib/gvc/Makefile.old
+++ b/lib/gvc/Makefile.old
@@ -14,10 +14,10 @@ INCS =  -I. \
 DEFINES = -DHAVE_CONFIG_H -DGVLIBDIR=$(LIBDIR)
 
 HDRS = gvc.h gvcint.h gvplugin_render.h \
-       gvplugin_layout.h gvplugin_text.h gvplugin.h
+       gvplugin_layout.h gvplugin_textlayout.h gvplugin.h
 
 OBJS = gvrender.o gvlayout.o gvcontext.o gvjobs.o \
-       gvplugin.o gvconfig.o gvevent.o gvtext.o
+       gvplugin.o gvconfig.o gvevent.o gvtextlayout.o
 
 libgvc.a : $(OBJS)
        $(RM) libgvc.a

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index eec63059f8167490e49b3f0cb424245021767c2b..436b2b5ac4879d90aeb035daaa49eb3b8967d78d 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -32,12 +32,14 @@
 #include        "macros.h"
 #include        "gvc.h"
 
-static char *libdir = GVLIBDIR;
-
 #ifndef DISABLE_CODEGENS
 extern void config_codegen_builtins(GVC_t *gvc);
 #endif
 
+#ifndef DISABLE_LTDL
+static char *libdir = GVLIBDIR;
+#endif
+
 /*
     A config for gvrender is a text file containing a
     list of plugin librariess and their capabilities using a tcl-like
@@ -132,9 +134,10 @@ static char *token(int *nest, char **tokens)
     return t;
 }
 
+#ifndef DISABLE_LTDL
 static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
 {
-    char *path, *packagename, *api, *type, *dir, *t;
+    char *path, *packagename, *api, *type;
     api_t gv_api;
     int quality, rc;
     int nest = 0;
@@ -176,6 +179,7 @@ static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
     }
     return 1;
 }
+#endif
 
 static void gvconfig_plugin_install_from_library(GVC_t * gvc, char *path, gvplugin_library_t *library)
 {
@@ -212,6 +216,7 @@ static void gvconfig_write_library_config(char *path, gvplugin_library_t *librar
 extern gvplugin_library_t *builtins[];
 #endif
 
+#ifndef DISABLE_LTDL
 static void config_rescan(GVC_t *gvc, char *config_path)
 {
     FILE *f = NULL;
@@ -254,6 +259,7 @@ static void config_rescan(GVC_t *gvc, char *config_path)
     if (f)
        fclose(f);
 }
+#endif
 
 /*
   gvconfig - parse a config file and install the identified plugins