From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 25 Sep 2009 10:22:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10639
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7931f177e0022ef66d0f2dfaa32e093ff3ca5c1;p=imagemagick

---

diff --git a/config/configure.xml b/config/configure.xml
index 7540883b5..8963298c3 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x656"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,6,5"/>
-  <configure name="RELEASE_DATE" value="2009-09-24"/>
+  <configure name="RELEASE_DATE" value="2009-09-25"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index 9de057bf1..2a3be6767 100755
--- a/configure
+++ b/configure
@@ -38589,6 +38589,7 @@ else
 fi
 
 
+gslib_framework='no'
 if test "$with_gslib" != 'yes'; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-gslib=$with_gslib "
 fi
@@ -38602,7 +38603,7 @@ $as_echo "-------------------------------------------------------------" >&6; }
 $as_echo_n "checking for Ghostscript... " >&6; }
     { $as_echo "$as_me:$LINENO: result: " >&5
 $as_echo "" >&6; }
-    framework=0;
+    framework=0
     failed=0
     passed=0
     if test "${ac_cv_header_ghostscript_iapi_h+set}" = set; then
@@ -39034,6 +39035,7 @@ $as_echo "no -- some components failed test" >&6; }
         else
             if test $framework -gt 0; then
                 GS_LIBS='-framework Ghostscript'
+                gslib_framework='yes'
                 { $as_echo "$as_me:$LINENO: result: yes, using framework." >&5
 $as_echo "yes, using framework." >&6; }
             else
@@ -43437,7 +43439,7 @@ PGPDecodeDelegateDefault='pgpv'
 POVDelegateDefault='povray'
 if test "$native_win32_build" = 'yes'; then
     PSDelegateDefault='gswin32c'
-elif test $framework -gt 0; then
+elif test "$gslib_framework" = 'yes'; then
     PSDelegateDefault='gsc'
 else
     PSDelegateDefault='gs'
diff --git a/configure.ac b/configure.ac
index ceb144209..4d2ba37ec 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1798,6 +1798,7 @@ AC_ARG_WITH([gslib],
     [with_gslib=$withval],
     [with_gslib='no'])
 
+gslib_framework='no'
 if test "$with_gslib" != 'yes'; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-gslib=$with_gslib "
 fi
@@ -1808,7 +1809,7 @@ if test "$with_gslib" != 'no'; then
     AC_MSG_RESULT([-------------------------------------------------------------])
     AC_MSG_CHECKING([for Ghostscript])
     AC_MSG_RESULT([])
-    framework=0;
+    framework=0
     failed=0
     passed=0
     AC_CHECK_HEADER(ghostscript/iapi.h,passed=`expr $passed + 1`,
@@ -1825,6 +1826,7 @@ if test "$with_gslib" != 'no'; then
         else
             if test $framework -gt 0; then
                 GS_LIBS='-framework Ghostscript'
+                gslib_framework='yes'
                 AC_MSG_RESULT([yes, using framework.])
             else
                 AC_MSG_RESULT([yes, using library.])
@@ -2629,7 +2631,7 @@ PGPDecodeDelegateDefault='pgpv'
 POVDelegateDefault='povray'
 if test "$native_win32_build" = 'yes'; then
     PSDelegateDefault='gswin32c'
-elif test $framework -gt 0; then
+elif test "$gslib_framework" = 'yes'; then
     PSDelegateDefault='gsc'
 else
     PSDelegateDefault='gs'
diff --git a/magick/version.h b/magick/version.h
index f0d7eae46..1c8c1bd83 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MagickLibVersionText  "6.5.6"
 #define MagickLibVersionNumber  2,0,0
 #define MagickLibSubversion  "-5"
-#define MagickReleaseDate  "2009-09-24"
+#define MagickReleaseDate  "2009-09-25"
 #define MagickChangeDate   "20090922"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.6/index.html"