...

diff --git a/configure b/configure
index 18333080932358931e028c42c9c4dddd064821c4..37397218b7011e7212a6668636cdc33d97af7b64 100755 (executable)
--- a/configure
+++ b/configure
@@ -4581,7 +4581,7 @@ MAGICK_PATCHLEVEL_VERSION=68
 
 MAGICK_VERSION=7.0.8-68
 
-MAGICK_GIT_REVISION=16175:d44f8a355:20191005
+MAGICK_GIT_REVISION=16176:b316fbb74:20191005
 
 
 # Substitute library versioning
@@ -9296,9 +9296,7 @@ $as_echo "$ax_cv_gcc_archflag" >&6; }
 if test "x$ax_cv_gcc_archflag" = xunknown; then
   :
 else
-
-  CFLAGS="$CFLAGS $ax_cv_gcc_archflag"
-  CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"
+  CFLAGS="$CFLAGS $ax_cv_gcc_archflag" CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"
 fi
 
 

diff --git a/configure.ac b/configure.ac
index 54d5ca100c138856042e93d30218283833c6c0f5..49cb89351f6e4647e375c790cdb90968a4690aba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -298,9 +298,7 @@ AC_PROG_AWK
 AC_PROG_MKDIR_P
 AM_WITH_DMALLOC
 AX_C___ATTRIBUTE__
-AX_GCC_ARCHFLAG([yes], [
-  CFLAGS="$CFLAGS $ax_cv_gcc_archflag"
-  CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"])
+AX_GCC_ARCHFLAG([yes])
 PKG_PROG_PKG_CONFIG([0.20])
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST

diff --git a/m4/ax_gcc_archflag.m4 b/m4/ax_gcc_archflag.m4
index c52b9b296e9fab68d94d325da566e65cd7e046f4..8d78a2d1367718697f8c03b92c192a0bd7d04cfa 100644 (file)
--- a/m4/ax_gcc_archflag.m4
+++ b/m4/ax_gcc_archflag.m4
@@ -262,6 +262,6 @@ AC_MSG_RESULT($ax_cv_gcc_archflag)
 if test "x$ax_cv_gcc_archflag" = xunknown; then
   m4_default([$3],:)
 else
-  m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag"])
+  m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag" CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"])
 fi
 ])