Fixed mismatched macro names

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 025c9d8006e971c917ca53314c9b2e323682c08b..440a4414ec4e9cf4f41dcbd521d16256c6144f86 100644 (file)
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -49,9 +49,9 @@ check_cxx_source_compiles("
     x.fetch_sub(1);
     return 0; 
   }
-" TAGLIB_HAVE_STD_ATOMIC)
+" HAVE_STD_ATOMIC)
 
-if(NOT TAGLIB_HAVE_STD_ATOMIC)
+if(NOT HAVE_STD_ATOMIC)
   check_cxx_source_compiles("
     #include <boost/atomic.hpp>
     int main() { 
@@ -60,9 +60,9 @@ if(NOT TAGLIB_HAVE_STD_ATOMIC)
       x.fetch_sub(1);
       return 0; 
     }
-  " TAGLIB_HAVE_BOOST_ATOMIC)
+  " HAVE_BOOST_ATOMIC)
 
-  if(NOT TAGLIB_HAVE_BOOST_ATOMIC)
+  if(NOT HAVE_BOOST_ATOMIC)
     check_cxx_source_compiles("
       int main() { 
         volatile int x;
@@ -70,9 +70,9 @@ if(NOT TAGLIB_HAVE_STD_ATOMIC)
         int y = __sync_sub_and_fetch(&x, 1);
         return 0; 
       }
-    " TAGLIB_HAVE_GCC_ATOMIC)
+    " HAVE_GCC_ATOMIC)
 
-    if(NOT TAGLIB_HAVE_GCC_ATOMIC)
+    if(NOT HAVE_GCC_ATOMIC)
       check_cxx_source_compiles("
         #include <libkern/OSAtomic.h>
         int main() { 
@@ -81,9 +81,9 @@ if(NOT TAGLIB_HAVE_STD_ATOMIC)
           int32_t y = OSAtomicDecrement32Barrier(&x);
           return 0; 
         }
-      " TAGLIB_HAVE_MAC_ATOMIC)
+      " HAVE_MAC_ATOMIC)
 
-      if(NOT TAGLIB_HAVE_MAC_ATOMIC)
+      if(NOT HAVE_MAC_ATOMIC)
         check_cxx_source_compiles("
           #include <windows.h>
           int main() { 
@@ -92,9 +92,9 @@ if(NOT TAGLIB_HAVE_STD_ATOMIC)
             LONG y = InterlockedDecrement(&x);
             return 0; 
           }
-        " TAGLIB_HAVE_WIN_ATOMIC)
+        " HAVE_WIN_ATOMIC)
 
-        if(NOT TAGLIB_HAVE_WIN_ATOMIC)
+        if(NOT HAVE_WIN_ATOMIC)
           check_cxx_source_compiles("
             #include <ia64intrin.h>
             int main() { 
@@ -103,7 +103,7 @@ if(NOT TAGLIB_HAVE_STD_ATOMIC)
               int y = __sync_sub_and_fetch(&x, 1);
               return 0; 
             }
-          " TAGLIB_HAVE_IA64_ATOMIC)
+          " HAVE_IA64_ATOMIC)
         endif()
       endif()
     endif()

diff --git a/config.h.cmake b/config.h.cmake
index 0a5c70152553f7784fb39298d816cefd9f2d01ac..436ca440557c24e1793a7fd8ff5d5f22b6de5561 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,7 +1,7 @@
 /* config.h. Generated by cmake from config.h.cmake */
 
-/* Indicates the endianness of your target system */
-/* 1 if little-endian, 2 if big-endiann. */
+/* Indicates the byte order of your target system */
+/* 1 if little-endian, 2 if big-endian. */
 #cmakedefine   SYSTEM_BYTEORDER ${SYSTEM_BYTEORDER}
 
 /* Defined if your compiler supports some byte swap functions */