Changeset 610 for libcaca/trunk/configure.acTweet

Timestamp:

Mar 15, 2006, 10:57:04 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Do not fail if SLsmg_utf8_enable was not found, just disable UTF-8 support in the SLang driver.
• Cosmetic fixes in configure.ac.

File:

• libcaca/trunk/configure.ac (modified) (10 diffs)

libcaca/trunk/configure.ac

@@ -58 +58 @@
 AC_TRY_COMPILE([#include <windows.h>],[Sleep(42);],
  [AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_SLEEP, 1, [Define if you have Windows' Sleep])],
+  AC_DEFINE(HAVE_SLEEP, 1, [Define to 1 if you have the `Sleep' function.])],
  [AC_MSG_RESULT(no)])
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
@@ -72 +72 @@
       AC_MSG_RESULT(yes)
       AC_DEFINE(SCREENUPDATE_IN_PC_H, 1,
-                Define if <pc.h> defines ScreenUpdate.)
-      AC_DEFINE(USE_CONIO, 1, Define to activate the conio.h backend driver)
+                Define to 1 if <pc.h> defines ScreenUpdate.)
+      AC_DEFINE(USE_CONIO, 1, Define to 1 to activate the conio.h backend driver)
       CACA_DRIVERS="${CACA_DRIVERS} conio"],
      [AC_MSG_RESULT(no)])])
@@ -89 +89 @@
       AC_MSG_RESULT(yes)
       AC_DEFINE(ALLOCCONSOLE_IN_WINDOWS_H, 1,
-                Define if <windows.h> defines AllocConsole.)
-      AC_DEFINE(USE_WIN32, 1, Define to activate the win32 backend driver)
+                Define to 1 if <windows.h> defines AllocConsole.)
+      AC_DEFINE(USE_WIN32, 1, Define to 1 to activate the win32 backend driver)
       CACA_DRIVERS="${CACA_DRIVERS} win32"],
      [AC_MSG_RESULT(no)])])
@@ -101 +101 @@
   ac_cv_my_have_slang="no"
   AC_CHECK_HEADERS(slang.h slang/slang.h,
-   [AC_CHECK_LIB(slang, SLsmg_utf8_enable,
-     [ac_cv_my_have_slang="yes"
-      AC_DEFINE(USE_SLANG, 1, Define to activate the slang backend driver (needs slang-utf8))
-      CPPFLAGS="${CPPFLAGS} -DOPTIMISE_SLANG_PALETTE=1"
-      CACA_LIBS="${CACA_LIBS} -lslang"
-      CACA_DRIVERS="${CACA_DRIVERS} slang"])])
+   [ac_cv_my_have_slang="yes"
+    AC_DEFINE(USE_SLANG, 1, Define to 1 to activate the slang backend driver)
+    AC_CHECK_LIB(slang, SLsmg_utf8_enable,
+     [AC_DEFINE(HAVE_SLSMG_UTF8_ENABLE, 1, Define to 1 if you have the `SLsmg_utf8_enable' function.)])
+    CPPFLAGS="${CPPFLAGS} -DOPTIMISE_SLANG_PALETTE=1"
+    CACA_LIBS="${CACA_LIBS} -lslang"
+    CACA_DRIVERS="${CACA_DRIVERS} slang"
+    break])
   if test "${ac_cv_my_have_slang}" = "no" -a "${enable_slang}" = "yes"; then
     AC_MSG_ERROR([cannot find slang development files])
@@ -118 +120 @@
     if test -n "${x_includes}"; then X_CFLAGS="-I${x_includes}"; fi
     if test -n "${x_libraries}"; then X_LIBS="-lX11 -L${x_libraries}"; fi
-    AC_DEFINE(USE_X11, 1, Define to activate the X11 backend driver)
+    AC_DEFINE(USE_X11, 1, Define to 1 to activate the X11 backend driver)
     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
     CACA_LIBS="${CACA_LIBS} ${X_LIBS}"
@@ -132 +134 @@
 if test "${enable_gl}" != "no"; then
   ac_cv_my_have_gl="no"
-  AC_CHECK_HEADERS(GL/gl.h GL/glut.h,
-   [AC_CHECK_LIB(glut, glutMainLoopEvent,
-     [ac_cv_my_have_gl="yes"
-      AC_DEFINE(USE_GL, 1, Define to activate the OpenGL backend driver)
-      CACA_LIBS="${CACA_LIBS} -lGL -lglut"
-      CACA_DRIVERS="${CACA_DRIVERS} gl"])])
+  AC_CHECK_HEADERS(GL/gl.h,
+   [AC_CHECK_HEADERS(GL/glut.h,
+     [AC_CHECK_LIB(glut, glutMainLoopEvent,
+       [ac_cv_my_have_gl="yes"
+        AC_DEFINE(USE_GL, 1, Define to 1 to activate the OpenGL backend driver)
+        CACA_LIBS="${CACA_LIBS} -lGL -lglut"
+        CACA_DRIVERS="${CACA_DRIVERS} gl"])])])
   if test "${ac_cv_my_have_gl}" = "no" -a "${enable_gl}" = "yes"; then
     AC_MSG_ERROR([cannot find OpenGL+FreeGLUT development files])
@@ -147 +150 @@
   AC_CHECK_HEADERS(sys/socket.h,
      [ac_cv_my_have_network="yes"
-      AC_DEFINE(USE_NETWORK, 1, Define to activate the network backend driver)
+      AC_DEFINE(USE_NETWORK, 1, Define to 1 to activate the network backend driver)
       CACA_DRIVERS="${CACA_DRIVERS} network"])
   if test "${ac_cv_my_have_network}" = "no" -a "${enable_network}" = "yes"; then
@@ -159 +162 @@
    [AC_CHECK_LIB(ncurses, initscr,
      [ac_cv_my_have_ncurses="yes"
-      AC_DEFINE(USE_NCURSES, 1, Define to activate the ncurses backend driver)
+      AC_DEFINE(USE_NCURSES, 1, Define to 1 to activate the ncurses backend driver)
       CACA_LIBS="${CACA_LIBS} -lncurses"
       CACA_DRIVERS="${CACA_DRIVERS} ncurses"
@@ -166 +169 @@
       LIBS="${LIBS} -lncurses"
       AC_CHECK_FUNCS(resizeterm resize_term)
-      LIBS="${SAVED_LIBS}"])])
+      LIBS="${SAVED_LIBS}"])
+    break])
   if test "${ac_cv_my_have_ncurses}" = "no" -a "${enable_ncurses}" = "yes"; then
     AC_MSG_ERROR([cannot find ncurses development files])
@@ -178 +182 @@
   CCASFLAGS="${CCASFLAGS} -I."
   LDFLAGS="${LDFLAGS} -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
-  AC_DEFINE(USE_VGA, 1, Define to activate the VGA backend driver)
+  AC_DEFINE(USE_VGA, 1, Define to 1 to activate the VGA backend driver)
   CACA_DRIVERS="${CACA_DRIVERS} vga"
 fi