Changeset 3147 for libpipi/trunk


Ignore:
Timestamp:
Oct 30, 2008, 2:02:48 AM (12 years ago)
Author:
Sam Hocevar
Message:

Clean up configure.ac.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/configure.ac

    r3075 r3147  
    6565    GETOPT_LIBS="${GETOPT_LIBS} -lgnugetopt"])])
    6666if test "$ac_cv_have_getopt_long" != "no"; then
    67   AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the `getopt_long' function.)
     67  AC_DEFINE(HAVE_GETOPT_LONG, 1, Define to 1 if you have the ‘getopt_long’ function.)
    6868fi
    6969AM_CONDITIONAL(NEED_GETOPT_LONG, test "$ac_cv_have_getopt_long" = "no")
     
    9090CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
    9191
    92 
    9392AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
    94 
    95 # Use DevIL?
    96 #AC_CHECK_HEADERS(IL/il.h,
    97 # [ac_cv_my_have_il="yes"],
    98 # [ac_cv_my_have_il="no"])
    99 #CPPFLAGS="${save_CPPFLAGS}"
    100 #AM_CONDITIONAL(USE_IL, test "${ac_cv_my_have_il}" = "yes")
    101 
    102 # Use Windows?
    103 #AC_CHECK_HEADERS(olectl.h,
    104 # [ac_cv_my_have_ole="yes"],
    105 # [ac_cv_my_have_ole="no"])
    106 #CPPFLAGS="${save_CPPFLAGS}"
    107 #AM_CONDITIONAL(USE_OLE, test "${ac_cv_my_have_ole}" = "yes")
    10893
    10994# Use SDL?
     
    209194fi
    210195
    211 
    212 
    213 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
    214   AC_MSG_ERROR([[cannot find DevIL, OLE, SDL_Image, Imlib2, Cocoa, or OpenCV, please install one of them]])
     196if 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
     197  AC_MSG_ERROR([[cannot find GDI+, SDL_Image, Imlib2, Cocoa or OpenCV, please install one of them]])
    215198fi
    216199
Note: See TracChangeset for help on using the changeset viewer.