Changeset 2628


Ignore:
Timestamp:
Aug 2, 2008, 2:00:45 AM (14 years ago)
Author:
Sam Hocevar
Message:
  • configure.ac: fix the OpenCV detection by using pkg-config.
Location:
libpipi/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/configure.ac

    r2621 r2628  
    7777# Use OpenCV?
    7878ac_cv_my_have_opencv="no"
    79 save_CPPFLAGS="${CPPFLAGS}"
    80 AC_PATH_PROG(OPENCV_CONFIG, opencv-config, no)
    81 if test "${OPENCV_CONFIG}" != "no"; then
    82   CPPFLAGS="${CPPFLAGS} `opencv-config --cflags`"
    83 fi
    84 AC_CHECK_HEADERS(cv.h,
    85  [ac_cv_my_have_opencv="yes"],
    86  [ac_cv_my_have_opencv="no"])
    87 CPPFLAGS="${save_CPPFLAGS}"
     79OPENCV="no"
     80PKG_CHECK_MODULES(OPENCV, opencv, [ac_cv_my_have_opencv="yes"])
    8881if test "${ac_cv_my_have_opencv}" != "no"; then
    8982  AC_DEFINE(USE_OPENCV, 1, Define to 1 to use OpenCV)
     
    9588IMLIB2="no"
    9689PKG_CHECK_MODULES(IMLIB2, imlib2, [ac_cv_my_have_imlib2="yes"])
    97 AC_MSG_RESULT($ac_cv_my_have_imlib2)
    9890if test "${ac_cv_my_have_imlib2}" != "no"; then
    9991  AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)
  • libpipi/trunk/pipi/Makefile.am

    r2603 r2628  
    4747
    4848if USE_OPENCV
    49 codec_cflags += `opencv-config --cflags`
    50 codec_libs += `opencv-config --libs opencv highgui`
     49codec_cflags += @OPENCV_CFLAGS@
     50codec_libs += @OPENCV_LIBS@
    5151codec_sources += codec/opencv.c
    5252endif
Note: See TracChangeset for help on using the changeset viewer.