X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=Makefile.PL;h=e340b22a63941998a8b7eb71e4a686a822185c40;hp=8aa3fd1b3485424b97f063df825f909a85353770;hb=4956f4b56e38c33e1f1dc81819112a9ab6551334;hpb=88342731a2fd71f68fe6f2f852494fa054d122f3

diff --git a/Makefile.PL b/Makefile.PL
index 8aa3fd1..e340b22 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,11 +1,11 @@
 use ExtUtils::MakeMaker;
 
-## $Id: Makefile.PL,v 1.9 2006-03-24 12:06:15 mike Exp $
+## $Id: Makefile.PL,v 1.16 2007-04-17 20:26:58 adam Exp $
 
 my $yazconf = "yaz-config";
 my $yazver = `$yazconf --version`;
-my $yazinc = `$yazconf --cflags threads`;
-my $yazlibs = `$yazconf --libs threads`;
+my $yazinc = `$yazconf --cflags servers`;
+my $yazlibs = `$yazconf --libs server`;
 if (!$yazver || (!$yazinc && !$yazlibs)) {
    die qq[
 ERROR: Unable to call script: yaz-config
@@ -15,15 +15,16 @@ SimpleServer module.
 ];
 }
 
-# Judging by the YAZ NEWS file, 2.1.10 was the first release to
-# include SRW/U support in the GFS
 chomp($yazver);
 my ($major, $minor, $trivial) = split(/\./, $yazver);
+# YAZ 2.1.14 is the first to propagate SRW/U addinfo correctly
+my ($needMaj, $needMin, $needTriv) = (2, 1, 99);
 #print "major=$major, minor=$minor, trivial=$trivial\n";
-die "You have YAZ version $major.$minor.$trivial; you need 2.1.10 or better"
-    if ($major < 2 || 
-	$major == 2 && $minor < 1 ||
-	$major == 2 && $minor == 1 && $trivial < 10);
+die "You have YAZ version $major.$minor.$trivial; " .
+    "you need $needMaj.$needMin.$needTriv or better."
+    if ($major < $needMaj || 
+	$major == $needMaj && $minor < $needMin ||
+	$major == $needMaj && $minor == $needMin && $trivial < $needTriv);
 
 # For Windows use
 # $yazinc = '-Ic:\yaz\include'
@@ -35,4 +36,5 @@ WriteMakefile(
     'LIBS'	=> [$yazlibs],   # e.g., '-lm' 
     'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
     'INC'	=> $yazinc,     # e.g., '-I/usr/include/other' 
+#    OPTIMIZE   => "-Wdeclaration-after-statement -g -O0",
 );