From 7956a6bd9da48c6a64d34960533e0f82164f2c9c Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Sun, 9 Jan 2005 04:08:39 +0000
Subject: [PATCH] disable libltdl for now missing lefty scripts in
 graphviz.spec.in disable cairo fontmetrics

---
 Makefile.am              |  3 ++-
 configure.ac             | 10 +++++-----
 graphviz.spec.in         |  1 +
 lib/common/fontmetrics.c |  6 ++++--
 lib/gvc/Makefile.am      |  6 ++++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ebe5f7bd3..1e4243fbf 100644
--- 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 5027344fd..8f838d41b 100644
--- 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 40207b8ec..92c800671 100644
--- 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 ffcc391f1..1601b0392 100644
--- 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 790f7ff38..ccfe3b435 100644
--- 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
-- 
2.50.1