X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=configure.in;h=23b9844f6054acc87487a05425bca7401e9fde01;hp=5ac4e94967a86dfc496cb99ce85e133b8f227178;hb=cb007c6145b0dbb3fcbe9826f081650becf9a05c;hpb=5501453af5f35ea671edc7186f9959d0421fa58d

diff --git a/configure.in b/configure.in
index 5ac4e94..23b9844 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,9 @@
-dnl Zebra, Index Data Aps, 1995-2003
-dnl $Id: configure.in,v 1.66 2003-02-25 14:17:59 adam Exp $
+dnl Zebra, Index Data Aps, 1995-2004
+dnl $Id: configure.in,v 1.94 2004-08-24 10:37:18 adam Exp $
 dnl
 AC_INIT(include/zebraver.h)
-AM_INIT_AUTOMAKE(idzebra,1.3.6)
+AM_INIT_AUTOMAKE(idzebra,1.4.0)
+AM_PROG_LIBTOOL
 dnl ------ Substitutions
 AC_SUBST(TCL_INCLUDE)
 AC_SUBST(TCL_LIB)
@@ -76,7 +77,6 @@ else
 	yazflag=""
 fi
 YAZ_INIT($yazflag)
-
 dnl ------ Look for Tcl
 dnl See if user has specified location of tclConfig.sh; otherwise
 dnl see if tclConfig.sh exists in same prefix lcoation as tclsh; otherwise
@@ -112,6 +112,7 @@ if test -r ${tclconfig}/tclConfig.sh; then
 		TCL_INCLUDE=-I${TCL_PREFIX}/include
 		TCL_LIB="$TCL_LIB_SPEC $TCL_LIBS"
 	fi
+	TCL_LIB=`echo $TCL_LIB|sed 's%-L/usr/lib%%g'`
         SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
         SHLIB_LD=$TCL_SHLIB_LD
         SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
@@ -207,6 +208,9 @@ else
 	fi
 fi
 dnl
+dnl ------ -lm
+AC_CHECK_LIB(m,sqrt)
+dnl
 dnl ------ EXPAT
 expat=yes
 AC_ARG_WITH(expat,   [  --with-expat[=DIR]      EXPAT library in DIR],[expat=$withval])
@@ -247,13 +251,11 @@ if test "$perl" != "no"; then
 	    AC_MSG_CHECKING(perl core directory)
 	    archdir=`$perlbin -MConfig -e 'print $Config{archlib}'`;
 	    perlcore="$archdir/CORE";
-	    if test "$perlcore"; then
+	    if test -d "$perlcore"; then
 		PERL_BINARY="$perlbin"
 		AC_MSG_RESULT($perlcore)	
-	        AC_DEFINE(HAVE_PERL,1)
 	    else
 		AC_MSG_RESULT(Failed)	
-		AC_DEFINE(HAVE_PERL,0)
 	    fi
 
 	    AC_MSG_CHECKING("for ExtUtils::Embed to determine ccopts")
@@ -287,10 +289,28 @@ if test "$perl" != "no"; then
 		AC_MSG_RESULT(XS libraries are not going to be available)
             fi
 
-	    ZPERL_LIBS="$LIBS"
+	    xLIBS="$LIBS"
+	    xCFLAGS="$CFLAGS"
 	    CFLAGS="$PERL_CFLAGS $CFLAGS"
 	    LIBS="$PERL_LIBS $LIBS"
-	    AM_CONDITIONAL(perl,true)
+
+	    AC_MSG_CHECKING(for perl library)
+            AC_TRY_LINK([
+            #include <stdio.h>
+             ],[
+            static void f()
+            {
+		;
+            }
+		],AM_CONDITIONAL(perl,true)
+	          AC_DEFINE(HAVE_PERL,1)
+		  AC_MSG_RESULT(found)
+	          ZPERL_LIBS="$xLIBS"
+			,
+                  AC_MSG_RESULT(not found)
+	          AC_DEFINE(HAVE_PERL,0)
+		  LIBS="$xLIBS"
+		  CFLAGS="$xCFLAGS")
         else
 	    AC_DEFINE(HAVE_PERL,0)
 	    AC_MSG_RESULT(Not found)
@@ -352,7 +372,6 @@ AC_OUTPUT([
   isamb/Makefile
   isams/Makefile
   isamc/Makefile
-  isam/Makefile
   rset/Makefile
   data1/Makefile
   recctrl/Makefile
@@ -367,12 +386,19 @@ AC_OUTPUT([
   doc/zebraphp.dsl
   doc/tkl.xsl
   test/Makefile test/gils/Makefile test/usmarc/Makefile test/api/Makefile
+  test/rusmarc/Makefile test/cddb/Makefile test/malxml/Makefile 
+  test/config/Makefile
   perl/Makefile.PL test/xelm/Makefile
-  test/dmoz/Makefile test/xpath/Makefile test/sort/Makefile
+  test/dmoz/Makefile test/xpath/Makefile test/sort/Makefile test/zsh/Makefile
+  test/marcxml/Makefile test/charmap/Makefile test/codec/Makefile
   examples/Makefile examples/gils/Makefile examples/zthes/Makefile
   idzebra.spec
 ])
-
 if test -x "$perlbin"; then
-  res=`cd perl ; $perlbin Makefile.PL ; cd .. ;`;
+	res=`cd perl ; $perlbin Makefile.PL ; cd .. ;`;
+fi
+if test  -z "$YAZLIB"; then
+	echo "YAZ was not found. Use --with-yazconfig=DIR to specify location."
+	test -f /etc/debian_version && echo "Debian package libyaz-dev is required."
 fi
+