Changeset 8658

Timestamp:

2004-11-24T16:25:02+13:00 (19 years ago)

Author:

davidb

Message:

Configure and Makefile.in revised to use newer version of XMLParser (2.34)
plus link against explicit version of 'expat' in packages directory.

Location:

trunk/gsdl/packages

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)

trunk/gsdl/packages/Makefile.in

@@ -49 +49 @@
 
 PACKAGEDIRS =   wv/wv-gs rtftohtml/rtftohtml_src pdftohtml/pdftohtml_gs \
-        wget/wget-1.9 cpan/XML-Parser-2.27 $(YAZ) $(CORBA) \
+        wget/wget-1.9 expat/ cpan/XML-Parser-2.34 \
+        $(YAZ) $(CORBA) \
         xlhtml/xlhtml-0.4.9.0 isis-gdl
 

trunk/gsdl/packages/configure

@@ -183 +183 @@
 ./configure $CACHE_FILE --prefix=$PACKAGES/wget --bindir="$bindir" $HOSTTARGETFLAGS
 
+# configure expat (needs to be done before XML::Parser
+echo ""
+echo "Configuring expat"
+echo ""
+cd "$PACKAGES/expat"
+gzip -dc expat-1.95.8.tar.gz | tar -xf -
+cd "$PACKAGES/expat/expat-1.95.8" && \
+./configure $CACHE_FILE --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS
+
 # configure XML::Parser perl module
 echo ""
@@ -189 +198 @@
 cd "$PACKAGES/cpan"
 perl_dir=`echo 'my $vn = $]; $vn =~ s/5\.00(\d).*$/perl-5.$1/; print "$vn" ' | perl`
-gzip -dc XML-Parser-2.27.tar.gz | tar -xf -
-cd "$PACKAGES/cpan/XML-Parser-2.27" && \
-perl Makefile.PL "$GSDLHOME"
-# This for XML::Parser 2.31:
-# perl Makefile.PL \
-#   INSTALLSITELIB="$GSDLHOME/perllib/cpan/$perl_dir" \
-#   PREFIX="$GSDLHOME/perllib/cpan/XML" \
-#   INSTALLMAN1DIR="$GSDLHOME/perllib/cpan/$perl_dir" \
-#   INSTALLMAN3DIR="$GSDLHOME/perllib/cpan/$perl_dir" \
-#   SITEPREFIX="$GSDLHOME/perllib/cpan"
-
+gzip -dc XML-Parser-2.34.tar.gz | tar -xf -
+cd "$PACKAGES/cpan/XML-Parser-2.34" && \
+perl Makefile.PL \
+  INSTALLSITELIB="$GSDLHOME/perllib/cpan/$perl_dir" \
+  PREFIX="$GSDLHOME/perllib/cpan/XML" \
+  INSTALLMAN1DIR="$GSDLHOME/perllib/cpan/$perl_dir" \
+  INSTALLMAN3DIR="$GSDLHOME/perllib/cpan/$perl_dir" \
+  SITEPREFIX="$GSDLHOME/perllib/cpan" \
+  EXPATINCPATH="$GSDLHOME/packages/expat/include" \ 
+  EXPATLIBPATH="$GSDLHOME/packages/expat/lib" 
 
 # configure powerpoint converter