From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 22 Jan 2010 03:20:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10084
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcbeec82c36fa22d279fcc6dc84dde298527c95e;p=imagemagick

---

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index 9db032e72..840c0d1d8 100755
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -46,7 +46,7 @@ while test $# -gt 0; do
       echo "-I${includedir} -fopenmp"
       ;;
     --cxxflags)
-      echo '-g -O2 -Wall -W -ansi -pedantic -pthread'
+      echo '-g -O2 -Wall -W -pthread'
       ;;
     --cppflags)
       echo '-I/usr/local/include/ImageMagick'
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 42c15d988..1a5cc571f 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -140,7 +140,7 @@ foreach $delegate (qw/bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg
 # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile
 my $INC_magick = '-I../ -I.. -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/librsvg-2 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"';
 my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm';
-my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -ansi -pedantic -pthread";
+my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -pthread";
 my $LDFLAGS_magick   = "-L../magick/.libs -lMagickCore $Config{'ldflags'} ";
 my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} ";
 
diff --git a/config/config.h.in b/config/config.h.in
index 48b6d8c91..d7913d2f1 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -417,9 +417,6 @@
 /* Define to 1 if stdbool.h conforms to C99. */
 #undef HAVE_STDBOOL_H
 
-/* Define to 1 if you have the <stddef.h> header file. */
-#undef HAVE_STDDEF_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
diff --git a/config/configure.xml b/config/configure.xml
index dbeaca0f3..8de558c3d 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -15,14 +15,14 @@
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.5.9"/>
   <configure name="CC" value="gcc -std=gnu99"/>
-  <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -W -ansi -pedantic -pthread"/>
+  <configure name="CFLAGS" value="-fopenmp -g -O2 -Wall -W -pthread"/>
   <configure name="CPPFLAGS" value="-I/usr/local/include/ImageMagick"/>
   <configure name="PCFLAGS" value="-fopenmp"/>
   <configure name="DEFS" value="-DHAVE_CONFIG_H"/>
   <configure name="LDFLAGS" value="-L/usr/local/lib "/>
   <configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
   <configure name="CXX" value="g++"/>
-  <configure name="CXXFLAGS" value="-g -O2 -Wall -W -ansi -pedantic -pthread"/>
+  <configure name="CXXFLAGS" value="-g -O2 -Wall -W -pthread"/>
   <configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
   <configure name="HOST" value="x86_64-unknown-linux-gnu"/>
   <configure name="DELEGATES" value="bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml wmf zlib"/>
diff --git a/configure b/configure
index 88cdfac6d..fd291ab5b 100755
--- a/configure
+++ b/configure
@@ -7426,7 +7426,7 @@ fi
     then
       if test "$GXX" = "yes"
       then
-        ac_compile_warnings_opt='-Wall -W -ansi -pedantic'
+        ac_compile_warnings_opt='-Wall -W'
       fi
       CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
       ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
@@ -7436,7 +7436,7 @@ fi
   then
     if test "$GCC" = "yes"
     then
-      ac_compile_warnings_opt='-Wall -W -ansi -pedantic'
+      ac_compile_warnings_opt='-Wall -W'
     fi
     CFLAGS="$CFLAGS $ac_compile_warnings_opt"
     ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
diff --git a/libtool b/libtool
index f634a7d93..a0c5ef25d 100755
--- a/libtool
+++ b/libtool
@@ -138,7 +138,7 @@ old_postuninstall_cmds=""
 LTCC="gcc -std=gnu99"
 
 # LTCC compiler flags.
-LTCFLAGS="-fopenmp -g -O2 -Wall -W -ansi -pedantic -pthread"
+LTCFLAGS="-fopenmp -g -O2 -Wall -W -pthread"
 
 # Take the output of nm and produce a listing of raw symbols and C names.
 global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
diff --git a/m4/ac_compile_warnings.m4 b/m4/ac_compile_warnings.m4
index f52cc9ab5..f1030d34d 100644
--- a/m4/ac_compile_warnings.m4
+++ b/m4/ac_compile_warnings.m4
@@ -71,7 +71,7 @@ AC_MSG_CHECKING([maximum warning verbosity option])
     then
       if test "$GXX" = "yes"
       then
-        ac_compile_warnings_opt='-Wall -W -ansi -pedantic'
+        ac_compile_warnings_opt='-Wall -W'
       fi
       CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
       ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
@@ -81,7 +81,7 @@ AC_MSG_CHECKING([maximum warning verbosity option])
   then
     if test "$GCC" = "yes"
     then
-      ac_compile_warnings_opt='-Wall -W -ansi -pedantic'
+      ac_compile_warnings_opt='-Wall -W'
     fi
     CFLAGS="$CFLAGS $ac_compile_warnings_opt"
     ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
diff --git a/magick/Magick-config b/magick/Magick-config
index 4d556cffc..b1cfbcf12 100755
--- a/magick/Magick-config
+++ b/magick/Magick-config
@@ -43,7 +43,7 @@ while test $# -gt 0; do
       echo "-I${includedir} -fopenmp"
       ;;
     --cxxflags)
-      echo '-g -O2 -Wall -W -ansi -pedantic -pthread'
+      echo '-g -O2 -Wall -W -pthread'
       ;;
     --cppflags)
       echo '-I/usr/local/include/ImageMagick'
diff --git a/magick/magick-config.h b/magick/magick-config.h
index 291256ca5..271dbbef2 100644
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -628,9 +628,6 @@
 #define MAGICKCORE_HAVE_STDBOOL_H  1 
 #endif
 
-/* Define to 1 if you have the <stddef.h> header file. */
-/* #undef HAVE_STDDEF_H */
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #ifndef MAGICKCORE_HAVE_STDINT_H 
 #define MAGICKCORE_HAVE_STDINT_H  1 
@@ -1332,9 +1329,7 @@
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
-#ifndef _magickcore_inline 
-#define _magickcore_inline  __inline__ 
-#endif
+/* #undef inline */
 #endif
 
 /* Define to `int' if <sys/types.h> does not define. */
diff --git a/wand/Wand-config b/wand/Wand-config
index 2974c8af6..00ce38130 100755
--- a/wand/Wand-config
+++ b/wand/Wand-config
@@ -43,7 +43,7 @@ while test $# -gt 0; do
       echo "-I${includedir} -fopenmp"
       ;;
     --cxxflags)
-      echo '-g -O2 -Wall -W -ansi -pedantic -pthread'
+      echo '-g -O2 -Wall -W -pthread'
       ;;
     --cppflags)
       echo '-I/usr/local/include/ImageMagick'