diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-29 18:13:11 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-07-29 18:13:11 +0000 |
| commit | b98e54a92f46aee58970fd608a3d770067e59f08 (patch) | |
| tree | d4c052ed6c74a5963baa84519cf3fc9bfbe5f35d /configure.in | |
| parent | 601f7d070821845e89010ff1a7526b976f6bbeea (diff) | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configure.in b/configure.in index cccc26d0b..856739bf1 100644 --- 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 |