Changeset 3702 in orxonox.OLD

Timestamp:

Mar 31, 2005, 10:43:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: test for SDL_ttf is now as it should be

Location:

orxonox/branches/textEngine

Files:

• config.h.in (modified) (1 diff)
• configure (modified) (4 diffs)
• configure.ac (modified) (2 diffs)

orxonox/branches/textEngine/config.h.in

@@ -62 +62 @@
 #undef HAVE_SDL_SDL_H
 
-/* Define to 1 if you have the <SDL/SDL_ttf.h> header file. */
-#undef HAVE_SDL_SDL_TTF_H
+/* Define to 1 if you have the <SDL_ttf.h> header file. */
+#undef HAVE_SDL_TTF_H
 
 /* Define to 1 if you have the `sqrt' function. */

orxonox/branches/textEngine/configure

@@ -6107 +6107 @@
 ###################################
 
-#-----------#
-# SDL_Image #
-#-----------#
-#if test x$def_sdl_ttf = xyes; then
+#---------#
+# SDL_ttf #
+#---------#
 # checking for SDL_ttf-headers
 
-for ac_header in SDL/SDL_ttf.h
+for ac_header in SDL_ttf.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6259 +6258 @@
 
 else
-  echo "sdl_ttf not found. falling back to other options"; def_sdl_ttf=no
+  { { echo "$as_me:$LINENO: error: cannot find SDL_ttf header." >&5
+echo "$as_me: error: cannot find SDL_ttf header." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
@@ -6265 +6266 @@
 
 #fi
-#if test x$def_sdl_ttf = xyes; then
 # checking for SDL_ttf-lib
   echo "$as_me:$LINENO: checking for main in -lSDL_ttf" >&5
@@ -6338 +6338 @@
         exit -1
      fi
-#fi
-
 
 #-----------#

orxonox/branches/textEngine/configure.ac

@@ -398 +398 @@
 ###################################
 
-#-----------#
-# SDL_Image #
-#-----------#
-#if test x$def_sdl_ttf = xyes; then
+#---------#
+# SDL_ttf #
+#---------#
 # checking for SDL_ttf-headers
-  AC_CHECK_HEADERS([SDL/SDL_ttf.h] ,,
-      [echo "sdl_ttf not found. falling back to other options"; def_sdl_ttf=no ])
+  AC_CHECK_HEADERS([SDL_ttf.h] ,,
+      [AC_MSG_ERROR([cannot find SDL_ttf header.])])
 #fi
-#if test x$def_sdl_ttf = xyes; then
 # checking for SDL_ttf-lib
   AC_CHECK_LIB([SDL_ttf], [main], [FOUND_SDL_ttf=yes])
@@ -418 +416 @@
         exit -1
      fi   
-#fi
-
 
 #-----------#