Better method to find DynaLoader.a, fixed some Fedora failures.

diff --git a/Makefile b/Makefile
index dba36bd..cfa2f9b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.

-# $Id: Makefile,v 1.31 2006-11-01 10:32:46 rich Exp $
+# $Id: Makefile,v 1.32 2008-02-23 15:57:58 rich Exp $

 
 include Makefile.config
 
 
 include Makefile.config
 


@@ -19,7 +19,10 @@ OCAMLOPTFLAGS := -w s $(OCAMLOPTINCS)
 PERLCFLAGS := $(shell perl -e 'use Config; print $$Config{ccflags};')
 
 CC := gcc
 PERLCFLAGS := $(shell perl -e 'use Config; print $$Config{ccflags};')
 
 CC := gcc

-CFLAGS := -fPIC -Wall -Wno-unused -I$(PERLINCDIR) $(PERLCFLAGS) $(EXTRA_CFLAGS)
+CFLAGS := -fPIC -Wall -Wno-unused \
+       -I$(OCAMLLIBDIR) \
+       -I$(PERLINCDIR) $(PERLCFLAGS) \
+       $(EXTRA_CFLAGS)

 
 LIBPERL := $(shell perl -MExtUtils::Embed -e ldopts)
 
 
 LIBPERL := $(shell perl -MExtUtils::Embed -e ldopts)
 

diff --git a/Makefile.config b/Makefile.config
index 09b89f6..212361b 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,5 +1,5 @@
 # perl4caml configuration -*- Makefile -*-
 # perl4caml configuration -*- Makefile -*-

-# $Id: Makefile.config,v 1.25 2005-03-31 13:46:31 rich Exp $
+# $Id: Makefile.config,v 1.26 2008-02-23 15:57:58 rich Exp $

 
 # PERLINCDIR
 # Directory containing the Perl include files, eg. <EXTERN.h>.
 
 # PERLINCDIR
 # Directory containing the Perl include files, eg. <EXTERN.h>.


@@ -36,10 +36,11 @@ EXTRA_CFLAGS := -DPERL4CAML_REFCOUNTING_EXPERIMENTAL=1
 # To work out what this should be, try:
 # `perl -MExtUtils::Embed -e ldopts'
 
 # To work out what this should be, try:
 # `perl -MExtUtils::Embed -e ldopts'
 

-DYNALOADER_HACK := /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a
+DYNALOADER_HACK := $(shell perl -MExtUtils::Embed -e ldopts | egrep -o '/[^[:space:]]*DynaLoader.a')
+#DYNALOADER_HACK := /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a

 #DYNALOADER_HACK := /System/Library/Perl/5.8.1/darwin-thread-multi-2level/auto/DynaLoader/DynaLoader.a
 
 # PACKAGE and VERSION
 
 PACKAGE := perl4caml
 #DYNALOADER_HACK := /System/Library/Perl/5.8.1/darwin-thread-multi-2level/auto/DynaLoader/DynaLoader.a
 
 # PACKAGE and VERSION
 
 PACKAGE := perl4caml

-VERSION := 0.9.3
+VERSION := 0.9.4