disable libltdl for now

missing lefty scripts in graphviz.spec.in
disable cairo fontmetrics

diff --git a/Makefile.am b/Makefile.am
index ebe5f7bd31c7a4f3a4ddd0cf2f214bc4c51f2ef2..1e4243fbf085728e823872c0b8281b694cbf8ef4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ html =
 txt_DATA = $(txt)
 html_DATA = $(html)
 
-SUBDIRS = libltdl lib plugin cmd tclpkg doc contrib graphs
+#SUBDIRS = libltdl lib plugin cmd tclpkg doc contrib graphs
+SUBDIRS = lib plugin cmd tclpkg doc contrib graphs
 
 doxygen:
        doxygen

diff --git a/configure.ac b/configure.ac
index 5027344fd5fa5085ce9ebaad892072634a97df85..8f838d41bef334519b270048d9dfe8c3489ddfb9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,11 +3,11 @@ AC_INIT(graphviz, 2.1)
 AC_CONFIG_SRCDIR(configure.ac)
 AC_CONFIG_AUX_DIR(config)
 
-AC_CONFIG_SUBDIRS(libltdl)
-AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_CONVENIENCE
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
+# AC_CONFIG_SUBDIRS(libltdl)
+#AC_LIBTOOL_DLOPEN
+#AC_LIBLTDL_CONVENIENCE
+#AC_SUBST(INCLTDL)
+#AC_SUBST(LIBLTDL)
 
 # Checks for system type
 AC_CANONICAL_TARGET

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 40207b8ec242eecc5978a838ab64dc74659cf066..92c80067189dacd4a1d14bd66fd5a4dcec0b0bdf 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -98,6 +98,7 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 %doc AUTHORS COPYING ChangeLog NEWS
 %{_bindir}/*
 %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/lefty
 %{_mandir}/man1/*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/lib*.so.*

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index ffcc391f1b9da402c8b2bf9fd50c9895b1b085f6..1601b039241e894522ecb227d5188c9c0ed1ba12 100644 (file)
--- a/lib/common/fontmetrics.c
+++ b/lib/common/fontmetrics.c
@@ -17,7 +17,8 @@
 #include "render.h"
 #include "utils.h"
 
-#ifdef HAVE_CAIRO
+/* #ifdef HAVE_CAIRO */
+#if 0
 #include <cairo.h>
 #else
 
@@ -195,7 +196,8 @@ estimate_textsize(textline_t * textline, char *fontname, double fontsz,
 double textwidth(textline_t * textline, char *fontname, double fontsize)
 {
     char *fontpath = NULL;
-#ifdef HAVE_CAIRO
+/* #ifdef HAVE_CAIRO */
+#if 0
     cairo_t *cr;
     cairo_text_extents_t extents;
 

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 790f7ff38470dcdcc44c78282f192939624eb652..ccfe3b435883b931e249418ee8cfbd54c1bfa011 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -9,9 +9,11 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/pathplan \
        -I$(top_srcdir)/lib/graph \
-       -I$(top_srcdir)/lib/cdt @INCLTDL@ @CAIRO_CFLAGS@
+       -I$(top_srcdir)/lib/cdt @CAIRO_CFLAGS@
 
-LIBS = @LIBLTDL@
+#@INCLTDL@
+
+#LIBS = @LIBLTDL@
 
 pkginclude_HEADERS = gvc.h gvcint.h gvplugin_render.h \
        gvplugin_layout.h gvplugin.h