Changeset 1531

Timestamp:

2000-09-11T10:28:16+12:00 (24 years ago)

Author:

jrm21

Message:

Modified yaz package so that autoconf and automake are never automatically
run.

Location:

trunk/gsdl/packages/yaz

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• lib/Makefile.in (modified) (1 diff)

trunk/gsdl/packages/yaz/Makefile.in

@@ -74 +74 @@
 AUTOMAKE_OPTIONS = foreign 
 
-# commented out things we don't need to build (jrm21)
-#DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib include client ztest doc
-DIST_SUBDIRS = util odr z39.50 asn zutil comstack tab lib include client
+DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server lib include client ztest doc
 
 SUBDIRS = @SUBDIRS_VAR@
@@ -97 +95 @@
 GZIP_ENV = --best
 all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-    cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-    cd $(top_builddir) \
-      && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in 
-    cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-    $(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-    cd $(srcdir) && $(AUTOCONF)
+
+# DON'T WANT IT AUTOMATICALLY REGENERATING ITSELF!!!
+# .SUFFIXES:
+# $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+#   cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+#
+# Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#   cd $(top_builddir) \
+#     && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#
+# $(ACLOCAL_M4):  configure.in 
+#   cd $(srcdir) && $(ACLOCAL)
+#
+# config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+#   $(SHELL) ./config.status --recheck
+# $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+#   cd $(srcdir) && $(AUTOCONF)
 
 # This directory's subdirectories are mostly independent; you can cd

trunk/gsdl/packages/yaz/configure

@@ -1297 +1297 @@
 fi
 
-#if test "$enable_comp" = "yes"; then
+if test "$enable_comp" = "yes"; then
     ASNMODULE="z39.50"
+    ILLMODULE="ill"
+    ILLLIB=../ill/libill.a
+    ASN_MAKEFILES="z39.50/Makefile ill/Makefile"
+    cp -f include/yaz/z-proto.h include/yaz/proto.h
+else
+    ILLMODULE=""
+    ASNMODULE=asn
     ILLLIB=""
-    ASN_MAKEFILES="z39.50/Makefile"
-    cp -f include/yaz/z-proto.h include/yaz/proto.h
-#else
-#   ILLMODULE=""
-#   ASNMODULE=asn
-#   ILLLIB=""
-#   ASN_MAKEFILES="asn/Makefile"
-#   cp -f include/yaz/prt-proto.h include/yaz/proto.h
-#fi
+    ASN_MAKEFILES="asn/Makefile"
+    cp -f include/yaz/prt-proto.h include/yaz/proto.h
+fi
 checkBoth=0
 echo $ac_n "checking for connect""... $ac_c" 1>&6
@@ -1994 +1995 @@
 
 fi
-SUBDIRS_VAR="util odr $ASNMODULE zutil comstack ccl tab include lib  $DOCMODULE"
+SUBDIRS_VAR="util odr $ASNMODULE zutil comstack ccl tab include lib client $DOCMODULE"
 
 trap '' 1 2 15

trunk/gsdl/packages/yaz/configure.in

@@ -99 +99 @@
 fi
 dnl
-SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest $DOCMODULE"
+dnl retrieval $ILLMODULE server ztest
+SUBDIRS_VAR="util odr $ASNMODULE zutil comstack ccl tab include lib client $DOCMODULE"
 AC_SUBST(SUBDIRS_VAR)
 dnl
 dnl ------ Makefiles
 dnl
-AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile ill/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile retrieval/Makefile server/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile ztest/Makefile doc/Makefile)
+dnl retrieval/Makefile ill/Makefile server/Makefile ztest/Makefile
+AC_OUTPUT(Makefile util/Makefile odr/Makefile z39.50/Makefile asn/Makefile zutil/Makefile comstack/Makefile ccl/Makefile tab/Makefile include/Makefile include/yaz/Makefile lib/Makefile client/Makefile doc/Makefile)

trunk/gsdl/packages/yaz/lib/Makefile.in

@@ -80 +80 @@
 LIB = libyaz.a
 
-# commented out in Makefile.in
-#YAZLIBS = ../odr/libodr.a ../@ASNMODULE@/libasn.a ../comstack/libcomstack.a  ../server/libserver.a ../zutil/libzutil.a ../util/libutil.a  ../ccl/libccl.a ../retrieval/libret.a @ILLLIB@
-YAZLIBS = ../odr/libodr.a ../@ASNMODULE@/libasn.a ../comstack/libcomstack.a  ../zutil/libzutil.a ../util/libutil.a  ../ccl/libccl.a
+# removed: ../server/libserver.a ../retrieval/libret.a @ILLLIB@
+YAZLIBS = ../odr/libodr.a ../@ASNMODULE@/libasn.a ../comstack/libcomstack.a   ../zutil/libzutil.a ../util/libutil.a  ../ccl/libccl.a