Changeset 3790 in orxonox.OLD for orxonox/trunk/configure.ac

Timestamp:

Apr 13, 2005, 12:33:07 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:

• orxonox/trunk/configure.ac (modified) (6 diffs)

orxonox/trunk/configure.ac

@@ -235 +235 @@
 echo "mingw-WINDOWS detected"
 
+CPPFLAGS="-I/usr/include/SDL -I/mingw/include/SDL"
+
     mingw="yes"
     MSBITFIELDS="-mms-bitfields"
@@ -279 +281 @@
     fi
 # checking for SDL-headers
-    AC_CHECK_HEADERS([SDL/SDL.h] ,,
+    AC_CHECK_HEADERS([SDL.h] ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
@@ -313 +315 @@
  Linux="yes"
 
-CPPFLAGS="-I/usr/X11R6/include"
+CPPFLAGS="-I/usr/X11R6/include -I/usr/include/SDL"
 LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
 # checking gl header
@@ -347 +349 @@
 
 # checking for SDL-headers
-    AC_CHECK_HEADERS([SDL/SDL.h] ,,
+    AC_CHECK_HEADERS([SDL.h] ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
@@ -420 +422 @@
 ###################################
 
+#---------#
+# SDL_ttf #
+#---------#
+# checking for SDL_ttf-headers
+  AC_CHECK_HEADERS([SDL_ttf.h] ,,
+      [AC_MSG_ERROR([cannot find SDL_ttf header.])])
+#fi
+# checking for SDL_ttf-lib
+  AC_CHECK_LIB([SDL_ttf], [main], [FOUND_SDL_ttf=yes])
+     if test x$FOUND_SDL_ttf = xyes ; then
+       LIBS="$LIBS -lSDL_ttf"
+     else
+        echo "------------------"
+        echo "SDL_ttf library not found."
+        echo "please install the SDL_ttf library, which can be found at http://www.libsdl.org/projects/SDL_ttf/"
+        echo "------------------"
+        exit -1
+     fi   
+
 #-----------#
 # SDL_Image #
@@ -425 +446 @@
 if test x$def_sdl_image = xyes; then
 # checking for SDL_image-headers
-  AC_CHECK_HEADERS([SDL/SDL_image.h] ,,
+  AC_CHECK_HEADERS([SDL_image.h] ,,
       [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ])
 fi