Search
lxdream.org :: lxdream/configure.in :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename configure.in
changeset 1110:eb1c005ba3cb
prev1107:7b279d10f46f
next1113:174fa8e137b6
author nkeynes
date Mon Jul 12 22:41:38 2010 +1000 (12 years ago)
permissions -rw-r--r--
last change Change GL + libisofs checks to use pkg-config (Patch by ElBarto!)
file annotate diff log raw
1.1 --- a/configure.in Mon May 17 22:01:23 2010 +1000
1.2 +++ b/configure.in Mon Jul 12 22:41:38 2010 +1000
1.3 @@ -217,11 +217,12 @@
1.4
1.5 AM_CONDITIONAL(GUI_GTK, [test "$HAVE_GTK" = 'yes'])
1.6
1.7 -AC_CHECK_HEADER([libisofs/libisofs.h], [
1.8 - AC_CHECK_LIB(isofs, [iso_data_source_new_from_file], [
1.9 - LIBS="$LIBS -lisofs"
1.10 - ], [ AC_MSG_FAILURE( ["Libisofs library not found, but is required"]) ])],
1.11 - [ AC_MSG_FAILURE( ["Libisofs headers not found, but is required"]) ])
1.12 +PKG_CHECK_MODULES(LIBISOFS, [libisofs-1] )
1.13 +dnl AC_CHECK_HEADER([libisofs/libisofs.h], [
1.14 + dnl AC_CHECK_LIB(isofs, [iso_data_source_new_from_file], [
1.15 + dnl LIBS="$LIBS -lisofs"
1.16 + dnl ], [ AC_MSG_FAILURE( ["Libisofs library not found, but is required"]) ])],
1.17 + dnl [ AC_MSG_FAILURE( ["Libisofs headers not found, but is required"]) ])
1.18
1.19 dnl ------------------ Video driver support -------------------
1.20 AS_IF([test "x$with_osmesa" != xno], [
1.21 @@ -238,10 +239,11 @@
1.22 dnl Otherwise we want a real GL library (unless we're on darwin, in which case it's already
1.23 dnl taken care of above).
1.24 if test "x$APPLE_BUILD" != 'xyes'; then
1.25 - AC_CHECK_LIB(GL, glVertex3f, [], [
1.26 - AC_MSG_FAILURE( ["The OpenGL library (libGL.so) could not be found, but is required."])])
1.27 - AC_CHECK_HEADER([GL/gl.h], [], [
1.28 - AC_MSG_FAILURE( ["The OpenGL header files (eg GL/gl.h) could not be found, but are required."])])
1.29 + PKG_CHECK_MODULES(LIBGL, [gl] )
1.30 + dnl AC_CHECK_LIB(GL, glVertex3f, [], [
1.31 + dnl AC_MSG_FAILURE( ["The OpenGL library (libGL.so) could not be found, but is required."])])
1.32 + dnl AC_CHECK_HEADER([GL/gl.h], [], [
1.33 + dnl AC_MSG_FAILURE( ["The OpenGL header files (eg GL/gl.h) could not be found, but are required."])])
1.34 else
1.35 AC_CHECK_FUNC(NSOpenGLGetVersion, [
1.36 HAVE_NSGL='yes'
.