Ignore:
Timestamp:
Jan 13, 2009, 12:51:36 AM (14 years ago)
Author:
Sam Hocevar
Message:

Got rid of the modular codec stuff. All codecs should work the same way.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/configure.ac

    r3162 r3343  
    178178AM_CONDITIONAL(USE_COCOA, test "${ac_cv_my_have_cocoa}" = "yes")
    179179
    180 
    181 # Use Modular codecs ?
    182 MODULAR_CODEC=""
    183 ac_cv_my_have_modular="no"
    184 
    185 ac_cv_my_have_libjpeg="no"
     180# Use libjpeg?
     181ac_cv_my_have_jpeg="no"
    186182AC_CHECK_HEADERS(jpeglib.h,
    187  [ac_cv_my_have_libjpeg="yes"],
    188  [ac_cv_my_have_libjpeg="no"])
    189 if test "${ac_cv_my_have_libjpeg}" != "no"; then
    190   ac_cv_my_have_modular="yes"
    191   AC_DEFINE(USE_LIBJPEG, 1, Define to 1 to use libjpeg)
    192   AC_DEFINE(USE_MODULAR, 1, Define to 1 to use modular codecs)
    193   MODULAR_CODEC="${MODULAR_CODEC} libjpeg"
    194 fi
    195 AM_CONDITIONAL(USE_LIBJPEG, test "${ac_cv_my_have_libjpeg}" = "yes")
    196 AM_CONDITIONAL(USE_MODULAR, test "${ac_cv_my_have_modular}" = "yes")
    197 
    198 AC_MSG_CHECKING(valid modular codecs)
    199 if test -z "${MODULAR_CODEC}"; then
    200   AC_MSG_RESULT(none)
    201 else
    202   MODULAR_CODEC="${MODULAR_CODEC# *}"
    203   AC_MSG_RESULT([${MODULAR_CODEC}])
    204 fi
    205 
    206 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
     183 [ac_cv_my_have_jpeg="yes"],
     184 [ac_cv_my_have_jpeg="no"])
     185if test "${ac_cv_my_have_jpeg}" != "no"; then
     186  AC_DEFINE(USE_JPEG, 1, Define to 1 to use libjpeg)
     187fi
     188AM_CONDITIONAL(USE_JPEG, test "${ac_cv_my_have_jpeg}" = "yes")
     189
     190if 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_jpeg}" = "no"; then
    207191  AC_MSG_ERROR([[cannot find GDI+, SDL_Image, Imlib2, Cocoa or OpenCV, please install one of them]])
    208192fi
Note: See TracChangeset for help on using the changeset viewer.