Added CCL support for WIN32.

[yaz-moved-to-github.git] / configure

diff --git a/configure b/configure
index f368498..25ba5c6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1628,22 +1628,22 @@ if test "$enable_comp" = "yes"; then
        ILLMODULE="ill"
        ILLLIB=../ill/libill.la
        ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
-       HFILE=z-proto.h
+       HFILE=${srcdir}/include/yaz/z-proto.h
 else
        ILLMODULE=""
        ASNMODULE=asn
        ILLLIB=""
        ASN_MAKEFILES="asn/Makefile"
-       HFILE=prt-proto.h
+       HFILE=${srcdir}/asn/prt-proto.h
 fi
 echo $ac_n "checking whether proto.h needs to be generated""... $ac_c" 1>&6
 echo "configure:1641: checking whether proto.h needs to be generated" >&5
 yaz_include=${srcdir}/include/yaz
-if test -r ${yaz_include}/proto.h && cmp -s ${yaz_include}/$HFILE ${yaz_include}/proto.h; then
+if test -r ${yaz_include}/proto.h && cmp -s $HFILE ${yaz_include}/proto.h; then
        echo "$ac_t""no" 1>&6
 else
        echo "$ac_t""yes" 1>&6
-       cp -f ${yaz_include}/$HFILE ${yaz_include}/proto.h
+       cp -f $HFILE ${yaz_include}/proto.h
        if test "$enable_comp" != "yes"; then
                cp ${srcdir}/asn/*.h ${yaz_include}
        fi
@@ -2344,6 +2344,10 @@ fi
 YAZ_SRC_ROOT=`pwd`
 SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
 
+if test -f lib/yaz-config.in; then
+       rm lib/yaz-config.in
+fi
+sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config.in >lib/yaz-config.in
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -2477,7 +2481,8 @@ client/Makefile
 ztest/Makefile
 doc/Makefile
 yaz-config
-lib/yaz-config" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+lib/yaz-config
+" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -2603,7 +2608,8 @@ client/Makefile
 ztest/Makefile
 doc/Makefile
 yaz-config
-lib/yaz-config"}
+lib/yaz-config
+"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -2667,7 +2673,7 @@ cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-chmod +x lib/yaz-config yaz-config
+chmod +x yaz-config lib/yaz-config
 exit 0
 EOF
 chmod +x $CONFIG_STATUS