From 5816093c76b8af4f8e382cc7c6b5310619fec9f2 Mon Sep 17 00:00:00 2001
From: sam <sam@92316355-f0b4-4df1-b90c-862c8a59935f>
Date: Thu, 30 Oct 2008 01:02:48 +0000
Subject: [PATCH] Clean up configure.ac.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3147 92316355-f0b4-4df1-b90c-862c8a59935f
---
 configure.ac | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 935e2cd..9fb9581 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ AC_CHECK_FUNCS(getopt_long,
    [ac_cv_have_getopt_long="yes"
     GETOPT_LIBS="${GETOPT_LIBS} -lgnugetopt"])])
 if test "$ac_cv_have_getopt_long" != "no"; then
-  AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the `getopt_long' function.)
+  AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the ‘getopt_long’ function.)
 fi
 AM_CONDITIONAL(NEED_GETOPT_LONG, test "$ac_cv_have_getopt_long" = "no")
 AC_SUBST(GETOPT_LIBS)
@@ -89,23 +89,8 @@ CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
 # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
 CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
 
-
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
 
-# Use DevIL?
-#AC_CHECK_HEADERS(IL/il.h,
-# [ac_cv_my_have_il="yes"],
-# [ac_cv_my_have_il="no"])
-#CPPFLAGS="${save_CPPFLAGS}"
-#AM_CONDITIONAL(USE_IL, test "${ac_cv_my_have_il}" = "yes")
-
-# Use Windows?
-#AC_CHECK_HEADERS(olectl.h,
-# [ac_cv_my_have_ole="yes"],
-# [ac_cv_my_have_ole="no"])
-#CPPFLAGS="${save_CPPFLAGS}"
-#AM_CONDITIONAL(USE_OLE, test "${ac_cv_my_have_ole}" = "yes")
-
 # Use SDL?
 ac_cv_my_have_sdl="no"
 save_CPPFLAGS="${CPPFLAGS}"
@@ -208,10 +193,8 @@ else
   AC_MSG_RESULT([${MODULAR_CODEC}])
 fi
 
-
-
-if test "${ac_cv_my_have_il}" = "no" -a "${ac_cv_my_have_ole}" = "no" -a "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no" -a "${ac_cv_my_have_cocoa}" = "no" -a "${ac_cv_my_have_modular}" = "no"; then
-  AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2, Cocoa, or OpenCV, please install one of them]])
+if test "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no" -a "${ac_cv_my_have_cocoa}" = "no" -a "${ac_cv_my_have_modular}" = "no"; then
+  AC_MSG_ERROR([[cannot find GDI+, SDL_Image, Imlib2, Cocoa or OpenCV, please install one of them]])
 fi
 
 AC_SUBST(MATH_LIBS)