[Expat-checkins] CVS: expat Makefile.in,1.1,1.2 config.hin,1.1,1.2 configure.in,1.1,1.2

Clark Cooper coopercc@users.sourceforge.net
Thu, 21 Sep 2000 14:20:20 -0700


Update of /cvsroot/expat/expat
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6917

Modified Files:
	Makefile.in config.hin configure.in 
Log Message:
Merged in modifications from perl-expat. Also fiddled around with more
configuration issues.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in	2000/09/18 16:26:20	1.1
--- Makefile.in	2000/09/21 21:20:10	1.2
***************
*** 79,83 ****
  SUBDIRS = lib
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! CONFIG_HEADERS = @CONFIG_HEADERS@
  DIST_COMMON =  ChangeLog COPYING README Makefile.in aclocal.m4 config.hin \
                 configure configure.in conftools doc examples xmlwf
--- 79,83 ----
  SUBDIRS = lib
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! CONFIG_HEADERS = config.h:config.hin
  DIST_COMMON =  ChangeLog COPYING README Makefile.in aclocal.m4 config.hin \
                 configure configure.in conftools doc examples xmlwf
***************
*** 109,123 ****
  
  $(SUBDIRS): config.status
! 	$(MAKE) -C $@
  
  
  clean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir clean; \
  	done
  
  distclean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir distclean; \
  	done
  	rm -f config.h config.status libtool
--- 109,124 ----
  
  $(SUBDIRS): config.status
! 	cd $@; $(MAKE)
  
  
  clean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) clean; cd ..; \
  	done
+ 	rm -f core *~
  
  distclean:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) distclean; cd ..; \
  	done
  	rm -f config.h config.status libtool
***************
*** 131,135 ****
  	@list='$(SUBDIRS)'; for dir in $$list; do \
  	  test -d $(DISTDIR)/$$dir || mkdir $(DISTDIR)/$$dir; \
! 	  $(MAKE) -C $$dir distdir; \
  	done
  	@for file in $(DIST_COMMON); do \
--- 132,136 ----
  	@list='$(SUBDIRS)'; for dir in $$list; do \
  	  test -d $(DISTDIR)/$$dir || mkdir $(DISTDIR)/$$dir; \
! 	  cd $$dir; $(MAKE) distdir; cd ..; \
  	done
  	@for file in $(DIST_COMMON); do \
***************
*** 150,158 ****
  install:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir install; \
  	done
  
  uninstall:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  $(MAKE) -C $$dir uninstall; \
  	done
--- 151,159 ----
  install:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) install; cd ..; \
  	done
  
  uninstall:
  	@list='$(SUBDIRS)'; for dir in $$list; do \
! 	  cd $$dir; $(MAKE) uninstall; cd ..; \
  	done

Index: config.hin
===================================================================
RCS file: /cvsroot/expat/expat/config.hin,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config.hin	2000/09/18 16:26:20	1.1
--- config.hin	2000/09/21 21:20:10	1.2
***************
*** 61,64 ****
--- 61,66 ----
  #endif
  
+ #define XML_CONTEXT_BYTES 1024
+ 
  #ifndef HAVE_MEMMOVE
  #ifdef HAVE_BCOPY

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** configure.in	2000/09/18 16:26:20	1.1
--- configure.in	2000/09/21 21:20:10	1.2
***************
*** 25,29 ****
  AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
- AC_SUBST(CONFIG_HEADERS)
  
  dnl Checks for programs.
--- 25,28 ----