rmmain.c in rmagick-1.15.16

- old
+ new

@@ -1,6 +1,6 @@
-/* $Id: rmmain.c,v 1.159.2.2.2.1 2008/02/24 23:26:38 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.159.2.2.2.3 2008/11/25 23:21:15 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
 | Author:   Tim Hunter
 | Purpose:  Contains all module, class, method declarations.
@@ -1863,35 +1863,33 @@
 
 
 /*
  *  Static:     test_Magick_version
  *  Purpose:    Ensure the version of ImageMagick we're running with matches
- *              the version we were compiled with.
+ *              the version we were compiled with. We were compiled with MagickLibVersion.
+ *              GetMagickVersion returns the runtime version.
  *  Notes:      Bypass the test by defining the constant RMAGICK_BYPASS_VERSION_TEST
  *              to 'true' at the top level, before requiring 'RMagick'
 */
 static void test_Magick_version(void)
 {
     unsigned long version_number;
     const char *version_str;
-    const char *web_site =
-#if defined(MagickHomeURL)
-        MagickHomeURL
-#else
-        MagickWebSite
-#endif
-        ;
     int x, n;
     ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");
 
     if (RTEST(rb_const_defined(rb_cObject, bypass)) && RTEST(rb_const_get(rb_cObject, bypass)))
     {
         return;
     }
 
     version_str = GetMagickVersion(&version_number);
+#if defined(GRAPHICSMAGICK)
+    if ((version_number & 0xff0000) != (MagickLibVersion & 0xff0000))
+#else
     if (version_number != MagickLibVersion)
+#endif
     {
         // Extract the string "ImageMagick X.Y.Z"
         n = 0;
         for (x = 0; version_str[x] != '\0'; x++)
         {
@@ -1900,16 +1898,13 @@
                 break;
             }
         }
 
         rb_raise(rb_eRuntimeError,
-            "This version of RMagick was created to run with %s %s\n"
-            "but %.*s is installed on this system. You should either\n"
-            "   1) Configure and build RMagick for %.*s, or\n"
-            "   2) download %s %s from %s and install it.\n" ,
-            MagickPackageName, MagickLibVersionText, x, version_str, x, version_str,
-            MagickPackageName, MagickLibVersionText, web_site);
+            "This version of RMagick was created to run with %s %s "
+            "but %.*s is installed on this system.\n" ,
+            MagickPackageName, MagickLibVersionText, x, version_str);
     }
 
 }
 
 
@@ -1935,10 +1930,10 @@
     str = rb_str_new2(PACKAGE_STRING);
     (void) rb_obj_freeze(str);
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-        "This is %s ($Date: 2008/02/24 23:26:38 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2008/11/25 23:21:15 $) Copyright (C) 2008 by Timothy P. Hunter\n"
         "Built with %s\n"
         "Built for %s\n"
         "Web page: http://rmagick.rubyforge.org\n"
         "Email: rmagick@rubyforge.org\n",
         PACKAGE_STRING, mgk_version, RUBY_VERSION_STRING);