From: ellson <devnull@localhost>
Date: Sun, 18 Jul 2010 10:53:29 +0000 (+0000)
Subject: Applied patch from Philipp Thomas <pth@suse.de> to fix:
X-Git-Tag: LAST_LIBGRAPH~32^2~1264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b28dd6f8ab3feb00f5f9bff9c8980ac83fac708c;p=graphviz

Applied patch from Philipp Thomas <pth@suse.de> to fix:
"Calling modgraph.pl will fail because the dynamic loader won't find libperl.so"
Also needed to add BuildRequires: perl-ExtUtils-Embed
---

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 2fd40168f..9b65d3333 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -81,7 +81,7 @@ BuildRequires: xorg-x11-devel
 %define RUBY 1
 %define GUILE 1
 %define PYTHON 1
-BuildRequires: perl ruby ruby-devel guile-devel python python-devel
+BuildRequires: perl perl-ExtUtils-Embed ruby ruby-devel guile-devel python python-devel
 %endif
 %if %rhel >= 5
 %define JAVA 1
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index a91b6cacd..c70dc69e7 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -121,12 +121,16 @@ gv.cmxa: gv.cmx
 gv.a:	gv.cmxa
 
 pkgperldir = $(pkglibdir)/perl
+PERL        ?= perl
+PERL_CC      = $(shell $(PERL) -MExtUtils::Embed -e ccopts)
+PERL_LD      = $(shell $(PERL) -MExtUtils::Embed -e ldopts)
+VENDOR_ARCH  = $(shell $(PERL) -MConfig -e 'print $$Config{installvendorarch};')
 PERL_data = gv.pm
 nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data)
 libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_perl_la_LIBADD = $(BASELIBS) $(PERL_LIBS)
-libgv_perl_la_LDFLAGS = -module -avoid-version
-libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_INCLUDES)
+libgv_perl_la_LDFLAGS = -module -avoid-version $(PERL_LD)
+libgv_perl_la_CPPFLAGS = $(BASECPPFLAGS) $(PERL_CC)
 $(PERL_data): gv_perl.cpp
 gv_perl.cpp: gv.i
 	$(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i