Remove the GCC -Wshadow option.

Use fltk_xyz for the PNG, JPEG, and ZLIB libraries instead of the normal names, to avoid collisions with existing installs. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3727 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Jul 29, 2004 · b98e54a · b98e54a
1 parent 601f7d0
commit b98e54a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 38 deletions.
diff --git a/configure.in b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.115 2004/07/26 17:46:36 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.116 2004/07/29 18:13:10 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -375,7 +375,7 @@ AC_CHECK_LIB(jpeg,jpeg_CreateCompress,
     IMAGELIBS="-ljpeg $IMAGELIBS",
     JPEGINC="-I../jpeg"
     JPEG="jpeg"
-    IMAGELIBS="../lib/libjpeg.a $IMAGELIBS")
+    IMAGELIBS="-lfltk_jpeg $IMAGELIBS")
 
 AC_ARG_ENABLE(localzlib, [  --enable-localzlib      use local ZLIB library, default=auto],
     [if eval "test x$enable_localzlib = xyes"; then
@@ -389,8 +389,8 @@ AC_CHECK_LIB(z,gzgets,
     IMAGELIBS="-lz $IMAGELIBS",
     ZLIBINC="-I../zlib"
     ZLIB="zlib"
-    LIBS="../lib/libz.a $LIBS"
-    IMAGELIBS="../lib/libz.a $IMAGELIBS")
+    LIBS="-lfltk_z $LIBS"
+    IMAGELIBS="-lfltk_z $IMAGELIBS")
 
 AC_ARG_ENABLE(localpng, [  --enable-localpng       use local PNG library, default=auto],
     [if eval "test x$enable_localpng = xyes"; then
@@ -405,7 +405,7 @@ AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [
     AC_DEFINE(HAVE_PNG_H)
     PNGINC="-I../png"
     PNG="png"
-    IMAGELIBS="../lib/libpng.a $IMAGELIBS"])
+    IMAGELIBS="-lfltk_png $IMAGELIBS"])
 
 AC_SUBST(JPEG)
 AC_SUBST(JPEGINC)
@@ -716,11 +716,12 @@ if test -n "$GCC"; then
 
     CXX="$CC"
 
-    # Show all standard warnings + unused variables when compiling...
-    OPTIM="-Wall -Wunused $OPTIM"
+    # Show all standard warnings + unused variables, conversion errors,
+    # and inlining problems when compiling...
+    OPTIM="-Wall -Wunused -Wconversion -Winline $OPTIM"
 
     # The following additional warnings are useful for tracking down problems...
-    OPTIM="-Wshadow -Wconversion -Winline $OPTIM"
+    #OPTIM="-Wshadow $OPTIM"
 
     # Set the default compiler optimizations...
     if test -z "$DEBUGFLAG"; then
@@ -898,5 +899,5 @@ dnl Make sure the fltk-config script is executable...
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.115 2004/07/26 17:46:36 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.116 2004/07/29 18:13:10 easysw Exp $".
 dnl
diff --git a/fltk-config.in b/fltk-config.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: fltk-config.in,v 1.12.2.23 2004/07/26 17:46:36 easysw Exp $"
+# "$Id: fltk-config.in,v 1.12.2.24 2004/07/29 18:13:10 easysw Exp $"
 # 
 # FLTK configuration utility.
 #
@@ -59,7 +59,7 @@ LDLIBS="@LIBS@"
 LIBNAME="@LIBNAME@"
 DSONAME="@DSONAME@"
 DSOLINK="@DSOLINK@"
-IMAGELIBS="-ljpeg -lpng -lz"
+IMAGELIBS="@IMAGELIBS@"
 SHAREDSUFFIX="@SHAREDSUFFIX@"
 
 usage ()
@@ -266,5 +266,5 @@ if test "$echo_libs" = "yes"; then
 fi
 
 #
-# End of "$Id: fltk-config.in,v 1.12.2.23 2004/07/26 17:46:36 easysw Exp $".
+# End of "$Id: fltk-config.in,v 1.12.2.24 2004/07/29 18:13:10 easysw Exp $".
 #
diff --git a/jpeg/Makefile b/jpeg/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $"
+# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
 #
 # JPEG library makefile for the Fast Light Toolkit (FLTK).
 #
@@ -41,7 +41,7 @@ OBJS	=	jmemnobs.o \
 		jidctflt.o jidctfst.o jidctint.o jidctred.o jquant1.o \
 		jquant2.o jutils.o jmemmgr.o
 
-LIBJPEG	=	../lib/libjpeg$(LIBEXT)
+LIBJPEG	=	../lib/libfltk_jpeg$(LIBEXT)
 
 
 #
@@ -65,9 +65,9 @@ clean:
 #
 
 install:
-	echo "Installing libjpeg$(LIBEXT) in $(libdir)..."
+	echo "Installing libfltk_jpeg$(LIBEXT) in $(libdir)..."
 	-$(MKDIR) $(libdir)
-	$(RM) $(libdir)/libjpeg$(LIBEXT)
+	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
 	$(CP) $(LIBJPEG) $(libdir)
 
 
@@ -76,12 +76,12 @@ install:
 #
 
 uninstall:
-	echo "Uninstalling libjpeg$(LIBEXT) in $(libdir)..."
-	$(RM) $(libdir)/libjpeg$(LIBEXT)
+	echo "Uninstalling libfltk_jpeg$(LIBEXT) in $(libdir)..."
+	$(RM) $(libdir)/libfltk_jpeg$(LIBEXT)
 
 
 #
-# libjpeg.a
+# libfltk_jpeg.a
 #
 
 $(LIBJPEG):	$(OBJS)
@@ -103,5 +103,5 @@ include makedepend
 $(OBJS):	../makeinclude
 
 #
-# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $".
+# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
 #
diff --git a/png/Makefile b/png/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $"
+# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
 #
 # PNG library makefile for the Fast Light Toolkit (FLTK).
 #
@@ -33,7 +33,7 @@ OBJS	=	png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 		pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
 		pngwtran.o pngmem.o pngerror.o pngpread.o
 
-LIBPNG	=	../lib/libpng$(LIBEXT)
+LIBPNG	=	../lib/libfltk_png$(LIBEXT)
 
 
 #
@@ -57,24 +57,24 @@ clean:
 #
 
 install: $(LIBPNG)
-	echo "Installing libpng$(LIBEXT) in $(libdir)..."
+	echo "Installing libfltk_png$(LIBEXT) in $(libdir)..."
 	-$(MKDIR) $(libdir)
-	$(RM) $(libdir)/libpng$(LIBEXT)
+	$(RM) $(libdir)/libfltk_png$(LIBEXT)
 	$(CP) $(LIBPNG) $(libdir)
-	$(RANLIB) $(libdir)/libpng$(LIBEXT)
+	$(RANLIB) $(libdir)/libfltk_png$(LIBEXT)
 
 
 #
 # Uninstall everything...
 #
 
 uninstall:
-	echo "Uninstalling libpng$(LIBEXT) in $(libdir)..."
-	$(RM) $(libdir)/libpng$(LIBEXT)
+	echo "Uninstalling libfltk_png$(LIBEXT) in $(libdir)..."
+	$(RM) $(libdir)/libfltk_png$(LIBEXT)
 
 
 #
-# libpng.a
+# libfltk_png.a
 #
 
 $(LIBPNG):	$(OBJS)
@@ -97,5 +97,5 @@ $(OBJS):	../makeinclude
 
 
 #
-# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:26 easysw Exp $".
+# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
 #
diff --git a/zlib/Makefile b/zlib/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $"
+# "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $"
 #
 # GNU ZIP library makefile for the Fast Light Toolkit (FLTK).
 #
@@ -34,7 +34,7 @@ OBJS	=	adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o \
 		trees.o zutil.o inflate.o infblock.o inftrees.o infcodes.o \
 		infutil.o inffast.o
 
-LIBZ	=	../lib/libz$(LIBEXT)
+LIBZ	=	../lib/libfltk_z$(LIBEXT)
 
 
 #
@@ -58,24 +58,24 @@ clean:
 #
 
 install: $(LIBZ)
-	echo "Installing libz$(LIBEXT) in $(libdir)..."
+	echo "Installing libfltk_z$(LIBEXT) in $(libdir)..."
 	-$(MKDIR) $(libdir)
-	$(RM) $(libdir)/libz$(LIBEXT)
+	$(RM) $(libdir)/libfltk_z$(LIBEXT)
 	$(CP) $(LIBZ) $(libdir)
-	$(RANLIB) $(libdir)/libz$(LIBEXT)
+	$(RANLIB) $(libdir)/libfltk_z$(LIBEXT)
 
 
 #
 # Uninstall everything...
 #
 
 uninstall:
-	echo "Uninstalling libz$(LIBEXT) in $(libdir)..."
-	$(RM) $(libdir)/libz$(LIBEXT)
+	echo "Uninstalling libfltk_z$(LIBEXT) in $(libdir)..."
+	$(RM) $(libdir)/libfltk_z$(LIBEXT)
 
 
 #
-# libz.a
+# libfltk_z.a
 #
 
 $(LIBZ):	$(OBJS)
@@ -97,5 +97,5 @@ $(OBJS):	../makeinclude
 
 
 #
-# End of "$Id: Makefile,v 1.1.2.3 2004/07/23 19:26:27 easysw Exp $".
+# End of "$Id: Makefile,v 1.1.2.4 2004/07/29 18:13:11 easysw Exp $".
 #