1 files changed, 28 insertions, 38 deletions
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index 492c3054..c8464249 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -6,48 +6,38 @@
 #  BZIP2_LIBRARIES - Link these to use BZip2
 #  BZIP2_DEFINITIONS - Compiler switches required for using BZip2
 #  BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
-#
+
 # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 
+IF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+    SET(BZip2_FIND_QUIETLY TRUE)
+ENDIF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+
+FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
+
+FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 )
+
+IF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+   SET(BZIP2_FOUND TRUE)
+   INCLUDE(CheckLibraryExists)
+   CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
+ELSE (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+   SET(BZIP2_FOUND FALSE)
+ENDIF (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
+
+IF (BZIP2_FOUND)
+  IF (NOT BZip2_FIND_QUIETLY)
+    MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
+  ENDIF (NOT BZip2_FIND_QUIETLY)
+ELSE (BZIP2_FOUND)
+  IF (BZip2_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could NOT find BZip2")
+  ENDIF (BZip2_FIND_REQUIRED)
+ENDIF (BZIP2_FOUND)
+
+MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
 
-if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-
-  # in cache already, avoid doing the CHECK_LIBRARY_EXISTS again.
-  SET(BZIP2_FOUND TRUE)
-
-else (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-
-  FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h
-    /usr/include
-    /usr/local/include
-  )
-  
-  FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2
-    PATHS
-    /usr/lib
-    /usr/local/lib
-  )
-  
-  if (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-     set(BZIP2_FOUND TRUE)
-     INCLUDE(CheckLibraryExists)
-     CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
-  endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)
-  
-  if (BZIP2_FOUND)
-    if (NOT BZip2_FIND_QUIETLY)
-      message(STATUS "Found BZip2: ${BZIP2_LIBRARIES}")
-    endif (NOT BZip2_FIND_QUIETLY)
-  else (BZIP2_FOUND)
-    if (BZip2_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find BZip2")
-    endif (BZip2_FIND_REQUIRED)
-  endif (BZIP2_FOUND)
-  
-  MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
-
-endif (BZIP2_INCLUDE_DIR AND BZIP2_LIBRARIES)