--- configure.orig	Wed Jun 30 12:52:35 1999
+++ configure	Mon Jul 12 16:17:30 1999
@@ -555,7 +555,7 @@
 
 
 
-VERSION="2.0"
+VERSION="2"
 
 DEFINES=""
 
@@ -1503,6 +1503,7 @@
   PERLINCLUDE=nope
 fi
 
+PERLINCLUDE=`($PERL -e 'use Config; print $Config{privlib};') 2>/dev/null`
 
 # First figure out what the name of Perl5 is
 
@@ -1569,12 +1570,12 @@
 		PERLINCLUDE="-I$PERL5DIR"
 	fi
 	PERLLIBDIR=`($PERL -e 'use Config; print $Config{sitearchexp};') 2>/dev/null`
-	if test -z "$PERLLIBDIR" -o ! -d "$PERLLIBDIR"; then
+	if test -z "$PERLLIBDIR"; then
 		echo "$ac_t""unable to determine perl5 shared library directory" 1>&6
 		PERLIB="/usr/lib/perl5/site_perl/5.005/archname"
 	fi
 	PERLMODDIR=`($PERL -e 'use Config; print $Config{sitelib};') 2>/dev/null`
-	if test -z "$PERLMODDIR" -o ! -d "$PERLMODDIR"; then
+	if test -z "$PERLMODDIR"; then
 		echo "$ac_t""unable to determine perl5 module directory" 1>&6
 		PERLMODDIR="/usr/lib/perl5/site_perl/5.005"
 	fi
@@ -1887,7 +1888,7 @@
 	BINDINGS_TEST=""
 	CCSHARED=""
 else
-	PDFLIB=libpdf$VERSION$SO
+	PDFLIB=libpdf$SO.$VERSION
 fi
 
 
@@ -1902,7 +1903,7 @@
    	ZLIBLINK=""
 fi
 
-PDFLIBLINK="-lpdf$VERSION $TIFFLINK $ZLIBLINK -lm"
+PDFLIBLINK="-lpdf $TIFFLINK $ZLIBLINK -lm"