Changeset 3147Tweet

Timestamp:

Oct 30, 2008, 2:02:48 AM (14 years ago)

Author:

Sam Hocevar

Message:

Clean up configure.ac.

File:

• libpipi/trunk/configure.ac (modified) (3 diffs)

libpipi/trunk/configure.ac

@@ -65 +65 @@
     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")
@@ -90 +90 @@
 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?
@@ -209 +194 @@
 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