Changeset 1562

Timestamp:

02/01/2007 12:44:56 AM (19 months ago)

Author:

jan

Message:

improved the pkg-config checks for glib-2.0

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• src/CMakeLists.txt (modified) (4 diffs)

trunk/configure.in

@@ -382 +382 @@
 fi
 
-PKG_CHECK_MODULES(GTHREAD, gthread-2.0, [
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.6.0, [
   AC_DEFINE([HAVE_GTHREAD], [1], [libglib])
   AC_DEFINE([HAVE_GLIB_H], [1], [glib.h])

trunk/src/CMakeLists.txt

@@ -7 +7 @@
 INCLUDE(FindThreads)
 INCLUDE(CPack)
+INCLUDE(UsePkgConfig)
 
 INCLUDE(LighttpdMacros)
@@ -55 +56 @@
 CHECK_INCLUDE_FILES(time.h HAVE_TIME_H)
 
-INCLUDE_DIRECTORIES(/opt/gnome/include/glib-2.0 /opt/gnome/lib64/glib-2.0/include/)
+PKGCONFIG(gthread-2.0 GTHREAD_INCDIR GTHREAD_LIBDIR GTHREAD_LDFLAGS GTHREAD_CFLAGS)
+
+MESSAGE(STATUS "found glib-2.0 at: ${GTHREAD_INCDIR} ${GTHREAD_LIBDIR} ${GTHREAD_LDFLAGS} ${GTHREAD_CFLAGS}")
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTHREAD_CFLAGS}")
 
 IF(WITH_XATTR)
@@ -361 +366 @@
 IF(CMAKE_COMPILER_IS_GNUCC)
   ##  SET_TARGET_PROPERTIES(lighttpd PROPERTIES COMPILE_FLAGS "-std=gnu99 -Wall -O2 -g -Wshadow -W")
-  SET(CMAKE_C_FLAGS "-std=gnu99 -Wall -O2 -g -Wshadow -W")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -O2 -g -Wshadow -W -pedantic")
   ADD_DEFINITIONS(-D_GNU_SOURCE)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
@@ -370 +375 @@
 ENDIF(CMAKE_SYSTEM MATCHES "Linux")
 
-TARGET_LINK_LIBRARIES(lighttpd glib-2.0 gthread-2.0)
-SET_TARGET_PROPERTIES(lighttpd PROPERTIES LINK_FLAGS "-L/opt/gnome/lib64/ -pthread -lrt")
+SET_TARGET_PROPERTIES(lighttpd PROPERTIES LINK_FLAGS "${GTHREAD_LDFLAGS} -pthread -lrt")
 SET_TARGET_PROPERTIES(lighttpd PROPERTIES CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})