Dummy makefiles no longer generated for Zebra.

diff --git a/configure b/configure
index 16443e2..b9e6688 100755 (executable)
--- a/configure
+++ b/configure
@@ -979,7 +979,7 @@ if test "x$yazpath" != "xNONE"; then
 else
        for i in ../yaz* ../yaz; do
                if test -d $i; then
 else
        for i in ../yaz* ../yaz; do
                if test -d $i; then

-                       if test -r $i/include/yaz/yaz-version.h; then
+                       if test -r $i/yaz-config; then

                                yazconfig=$i/yaz-config
                        fi
                fi
                                yazconfig=$i/yaz-config
                        fi
                fi

@@ -1351,12 +1351,14 @@ EOF
 
        PROGPREFIX=zmbol
        SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index"
 
        PROGPREFIX=zmbol
        SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index"

+       SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isamc/Makefile isam/Makefile rset/Makefile recctrl/Makefile index/Makefile"

        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\
  ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"
 else
        PROGPREFIX=zebra
        SUBDIR="util bfile dfa dict isams rset recctrl index"
        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\
  ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"
 else
        PROGPREFIX=zebra
        SUBDIR="util bfile dfa dict isams rset recctrl index"

+       SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile rset/Makefile recctrl/Makefile index/Makefile"

        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\
  ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"
        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\
  ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"

@@ -1364,18 +1366,6 @@ else
 #define ZMBOL 0
 EOF
 
 #define ZMBOL 0
 EOF
 

-       if test ! -d isamc; then
-               mkdir isamc
-       fi
-       if test ! -r isamc/Makefile.in; then
-               touch isamc/Makefile.in
-       fi
-       if test ! -d isam; then
-               mkdir isam
-       fi
-       if test ! -r isam/Makefile.in; then
-               touch isam/Makefile.in
-       fi

 fi
 trap '' 1 2 15
 cat > confcache <<\EOF
 fi
 trap '' 1 2 15
 cat > confcache <<\EOF

@@ -1490,7 +1480,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 

-trap 'rm -fr `echo "Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isam/Makefile isamc/Makefile recctrl/Makefile rset/Makefile index/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "$SUBMAKE" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15

 EOF
 cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<EOF
 

@@ -1580,7 +1570,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
 
 cat >> $CONFIG_STATUS <<EOF
 

-CONFIG_FILES=\${CONFIG_FILES-"Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isam/Makefile isamc/Makefile recctrl/Makefile rset/Makefile index/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"$SUBMAKE"}

 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/configure.in b/configure.in
index a5aa931..7d7d074 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data Aps, 1994-1999
 dnl Zebra, Index Data Aps, 1994-1999

-dnl $Id: configure.in,v 1.15 2000-02-04 08:49:26 adam Exp $
+dnl $Id: configure.in,v 1.16 2000-03-01 10:02:04 adam Exp $

 dnl See the file LICENSE.2 for details.
 dnl
 AC_INIT(include/zebraver.h)
 dnl See the file LICENSE.2 for details.
 dnl
 AC_INIT(include/zebraver.h)

@@ -43,7 +43,7 @@ if test "x$yazpath" != "xNONE"; then
 else
        for i in ../yaz* ../yaz; do
                if test -d $i; then
 else
        for i in ../yaz* ../yaz; do
                if test -d $i; then

-                       if test -r $i/include/yaz/yaz-version.h; then
+                       if test -r $i/yaz-config; then

                                yazconfig=$i/yaz-config
                        fi
                fi
                                yazconfig=$i/yaz-config
                        fi
                fi

@@ -115,29 +115,19 @@ if test -r LICENSE.zmbol; then
        AC_DEFINE(ZMBOL,1)
        PROGPREFIX=zmbol
        SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index"
        AC_DEFINE(ZMBOL,1)
        PROGPREFIX=zmbol
        SUBDIR="util bfile dfa dict isams isamc isam rset recctrl index"

+       SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isamc/Makefile isam/Makefile rset/Makefile recctrl/Makefile index/Makefile"

        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\
  ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"
 else
        PROGPREFIX=zebra
        SUBDIR="util bfile dfa dict isams rset recctrl index"
        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a ../lib/isam.a\
  ../lib/recctrl.a ../lib/isamc.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"
 else
        PROGPREFIX=zebra
        SUBDIR="util bfile dfa dict isams rset recctrl index"

+       SUBMAKE="Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile rset/Makefile recctrl/Makefile index/Makefile"

        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\
  ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"
        AC_DEFINE(ZMBOL,0)
        SUBLIBS="../lib/rset.a ../lib/dict.a ../lib/isams.a\
  ../lib/recctrl.a ../lib/bfile.a ../lib/dfa.a\
  ../lib/zebrautl.a"
        AC_DEFINE(ZMBOL,0)

-       if test ! -d isamc; then
-               mkdir isamc
-       fi
-       if test ! -r isamc/Makefile.in; then
-               touch isamc/Makefile.in
-       fi
-       if test ! -d isam; then
-               mkdir isam
-       fi
-       if test ! -r isam/Makefile.in; then
-               touch isam/Makefile.in
-       fi

 fi
 dnl
 dnl ------ Create Makefiles
 fi
 dnl
 dnl ------ Create Makefiles

-AC_OUTPUT(Makefile util/Makefile bfile/Makefile dfa/Makefile dict/Makefile isams/Makefile isam/Makefile isamc/Makefile recctrl/Makefile rset/Makefile index/Makefile)
+AC_OUTPUT($SUBMAKE)