Rather use pkg-config to find luajit

Conflicts:
	CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 467a80ac75ab8489bbbebe00a14b305ea990d82d..a026e7eb1166d40e9b45531ed6dd81b3f1cbd7e5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,86 +129,44 @@ MACRO(FindLua _major _minor)
        UNSET(LUA_INCLUDE_DIR CACHE)
         UNSET(LUA_LIBRARY CACHE)
 
-        IF(ENABLE_LUAJIT MATCHES "ON")
-          FIND_PATH(LUA_INCLUDE_DIR lua.h
-            HINTS
-            $ENV{LUA_DIR}
-              PATH_SUFFIXES "include/luajit-2.0"
-            PATHS
-            /usr/local
-            /usr/pkg
-            /usr
-            ~/Library/Frameworks
-            /Library/Frameworks
-            /sw # Fink
-            /opt/local # DarwinPorts
-            /opt/csw # Blastwave
-            /opt
-          )
-        ELSE(ENABLE_LUAJIT MATCHES "ON")
-         FIND_PATH(LUA_INCLUDE_DIR lua.h
-           HINTS
-           $ENV{LUA_DIR}
-              PATH_SUFFIXES "include/lua${_major}${_minor}"
-                            "include/lua${_major}${_minor}"
-                            "include/lua${_major}.${_minor}"
-                            "include/lua-${_major}.${_minor}"
-                            include/lua include
-           PATHS
-           /usr/local
-           /usr/pkg
-           /usr
-           ~/Library/Frameworks
-           /Library/Frameworks
-           /sw # Fink
-           /opt/local # DarwinPorts
-           /opt/csw # Blastwave
-           /opt
-         )
-        ENDIF(ENABLE_LUAJIT MATCHES "ON")
+       FIND_PATH(LUA_INCLUDE_DIR lua.h
+         HINTS
+         $ENV{LUA_DIR}
+         PATH_SUFFIXES "include/lua${_major}${_minor}" 
+                                       "include/lua${_major}.${_minor}" 
+                                       "include/lua-${_major}.${_minor}"
+                                       include/lua include
+         PATHS
+         /usr/local
+         /usr/pkg
+         /usr
+         ~/Library/Frameworks
+         /Library/Frameworks
+         /sw # Fink
+         /opt/local # DarwinPorts
+         /opt/csw # Blastwave
+         /opt
+       )
        
-       # Check for luajit
-       IF(ENABLE_LUAJIT MATCHES "ON")
-           FIND_LIBRARY(LUA_LIBRARY NAMES
-                               "luajit${_major}${_minor}"
-                               "luajit${_major}.${_minor}"
-                               "luajit-${_major}.${_minor}"
-                               "luajit"
-                         HINTS
-                         $ENV{LUA_DIR}
-                         PATH_SUFFIXES lib64 lib
-                         PATHS
-                             ~/Library/Frameworks
-                             /Library/Frameworks
-                             /usr/local
-                             /usr
-                             /sw
-                             /opt/local
-                             /opt/csw
-                             /usr/pkg
-                             /opt
-                       )
-       ELSE(ENABLE_LUAJIT MATCHES "ON") 
-               FIND_LIBRARY(LUA_LIBRARY 
-                       NAMES lua 
+       FIND_LIBRARY(LUA_LIBRARY 
+               NAMES lua 
                        "lua${_major}${_minor}"
                        "lua${_major}.${_minor}" 
                        "lua-${_major}.${_minor}"
-                       HINTS
+               HINTS
                        $ENV{LUA_DIR}
-                       PATH_SUFFIXES lib64 lib
-                       PATHS
-                                       /usr/local
-                                       /usr
-                                       ~/Library/Frameworks
-                                       /Library/Frameworks
-                                       /sw
-                                       /opt/local
-                                       /opt/csw
-                                       /opt
-                       DOC "Lua library"
-               )    
-       ENDIF(ENABLE_LUAJIT MATCHES "ON")
+               PATH_SUFFIXES lib64 lib
+               PATHS
+                       /usr/local
+                       /usr
+                       ~/Library/Frameworks
+                       /Library/Frameworks
+                       /sw
+                       /opt/local
+                       /opt/csw
+                       /opt
+               DOC "Lua library"
+       )
        IF(LUA_LIBRARY AND LUA_INCLUDE_DIR)
                SET(LUA_FOUND 1)
                IF(NOT LUA_VERSION_MAJOR OR NOT LUA_VERSION_MINOR)
@@ -421,24 +379,21 @@ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 
 # Now find libraries and headers
 
-# Find lua libraries
 IF(ENABLE_LUAJIT MATCHES "ON")
-       # For luajit we need to check merely lua 5.1 as lua 5.2 is incompatible
-       FindLua(5 1)
-ELSE(ENABLE_LUAJIT MATCHES "ON")
+       ProcessPackage(LUAJIT luajit)
+ELSEIF(ENABLE_LUAJIT MATCHES "ON")
        FindLua(5 2)
        IF(NOT LUA_FOUND)
-               FindLua(5 1)
+               FindLua(5 1)
+       ENDIF(NOT LUA_FOUND)
+       IF(NOT LUA_FOUND)
+               MESSAGE(FATAL_ERROR "Lua not found, lua support is required for working")
+       ELSE(NOT LUA_FOUND)
+               SET(WITH_LUA 1)
+               INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}")
        ENDIF(NOT LUA_FOUND)
 ENDIF(ENABLE_LUAJIT MATCHES "ON")
 
-IF(NOT LUA_FOUND)
-       MESSAGE(FATAL_ERROR "Lua not found, lua support is required for working")
-ELSE(NOT LUA_FOUND)
-    SET(WITH_LUA 1)
-    INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}")
-ENDIF(NOT LUA_FOUND)
-
 #Check for openssl (required for dkim)
 IF(OPENSSL_FOUND)
        SET(HAVE_OPENSSL 1)