This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch: configure changes for zlib



The following is a top-level configure patch, a gcc and a java/Makefile.in
patch.  Once the top-level changes are approved I will move the zlib
,v files from the libgcj repository over to the gcc repository.

Top-level...

2000-09-02  Anthony Green  <green@cygnus.com>

        * Makefile.in (all-gcc): Depend on all-zlib.
        (CLEAN_MODULES): Add clean-zlib.
        (ALL_MODULES): Add all-zlib.
        * configure.in (host_libs): Add zlib.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/Makefile.in,v
retrieving revision 1.53
diff -u -p -u -r1.53 Makefile.in
--- Makefile.in	2000/08/13 20:44:50	1.53
+++ Makefile.in	2000/09/03 03:12:31
@@ -527,6 +527,7 @@ ALL_MODULES = \
 	all-uudecode \
 	all-wdiff \
 	all-zip \
+	all-zlib \
 	$(EXTRA_TARGET_HOST_ALL_MODULES)
 
 # This is a list of the check targets for all of the modules which are
@@ -874,7 +875,8 @@ CLEAN_MODULES = \
 	clean-time \
 	clean-uudecode \
 	clean-wdiff \
-	clean-zip
+	clean-zip \
+	clean-zlib
 
 # All of the target modules that can be cleaned
 CLEAN_TARGET_MODULES = \
@@ -1563,7 +1565,7 @@ all-gas: all-libiberty all-opcodes all-b
 all-gash: all-tcl
 all-gawk:
 ALL_GCC = all-gcc
-all-gcc: all-bison all-byacc all-binutils all-gas all-ld
+all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
 all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
 GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
 all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/configure.in,v
retrieving revision 1.70
diff -u -p -u -r1.70 configure.in
--- configure.in	2000/09/02 07:18:09	1.70
+++ configure.in	2000/09/03 03:12:31
@@ -41,7 +41,7 @@
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui"
+host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui zlib"
 
 if [ "${enable_gdbgui}" = "yes" ] ; then
 	host_libs="${host_libs} libgui"



In the gcc directory...

2000-09-02  Anthony Green  <green@redhat.com>

	* configure: Rebuilt.
	* configure.in (--with-system-zlib): New configure option.

Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/configure.in,v
retrieving revision 1.413
diff -u -p -u -r1.413 configure.in
--- configure.in	2000/09/02 03:28:46	1.413
+++ configure.in	2000/09/03 02:57:11
@@ -4785,6 +4785,17 @@ fi])
 AC_SUBST(GGC)
 echo "Using $GGC for garbage collection."
 
+# Use the system's zlib library.
+zlibdir=-L../../zlib
+zlibinc=-I$(srcdir)/../../zlib
+AC_ARG_WITH(system-zlib,
+[  --with-system-zlib      use installed libz],
+zlibdir=
+zlibinc=
+)
+AC_SUBST(zlibdir)
+AC_SUBST(zlibinc)
+
 # Build a new-abi (c++) system
 AC_ARG_ENABLE(new-gxx-abi,
 [  --enable-new-gxx-abi


(I've cut out the boring configure patch)



And the java directory...

2000-09-02  Anthony Green  <green@redhat.com>

	* Makefile.in (ZLIB): Set to zlib library.
	(LIBS): Add $(ZLIB).
	(INCLUDES): Look in zlib dir for headers.

Index: java/Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/Makefile.in,v
retrieving revision 1.53
diff -u -p -u -r1.53 Makefile.in
--- Makefile.in	2000/08/05 00:50:02	1.53
+++ Makefile.in	2000/09/03 02:57:15
@@ -148,16 +148,20 @@ ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS)
 # This is where we get libiberty.a from.
 LIBIBERTY = ../../libiberty/libiberty.a
 
+# This is where we get zlib from.  zlibdir is -L../../zlib by default,
+# and is nothing when configured with --enable-system-zlib.
+ZLIB = @zlibdir@ -lz
+
 # How to link with both our special library facilities
 # and the system's installed libraries.
-LIBS = $(INTLLIBS) $(LIBIBERTY) $(CLIB)
+LIBS = $(ZLIB) $(INTLLIBS) $(LIBIBERTY) $(CLIB)
 LIBDEPS = $(INTLLIBS) $(LIBIBERTY) ../errors.o
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,
 # so that tm.h and config.h will be found in the compilation
 # subdirectory rather than in the source directory.
-INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config -I$(srcdir)/../../include
+INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config -I$(srcdir)/../../include @zlibinc@
 
 # Always use -I$(srcdir)/config when compiling.
 .c.o:


AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]