Changeset 2628 for libpipi/trunkTweet

Timestamp:

Aug 2, 2008, 2:00:45 AM (15 years ago)

Author:

Sam Hocevar

Message:

• configure.ac: fix the OpenCV detection by using pkg-config.

Location:

libpipi/trunk

Files:

• configure.ac (modified) (2 diffs)
• pipi/Makefile.am (modified) (1 diff)

libpipi/trunk/configure.ac

@@ -77 +77 @@
 # Use OpenCV?
 ac_cv_my_have_opencv="no"
-save_CPPFLAGS="${CPPFLAGS}"
-AC_PATH_PROG(OPENCV_CONFIG, opencv-config, no)
-if test "${OPENCV_CONFIG}" != "no"; then
-  CPPFLAGS="${CPPFLAGS} `opencv-config --cflags`"
-fi
-AC_CHECK_HEADERS(cv.h,
- [ac_cv_my_have_opencv="yes"],
- [ac_cv_my_have_opencv="no"])
-CPPFLAGS="${save_CPPFLAGS}"
+OPENCV="no"
+PKG_CHECK_MODULES(OPENCV, opencv, [ac_cv_my_have_opencv="yes"])
 if test "${ac_cv_my_have_opencv}" != "no"; then
   AC_DEFINE(USE_OPENCV, 1, Define to 1 to use OpenCV)
@@ -95 +88 @@
 IMLIB2="no"
 PKG_CHECK_MODULES(IMLIB2, imlib2, [ac_cv_my_have_imlib2="yes"])
-AC_MSG_RESULT($ac_cv_my_have_imlib2)
 if test "${ac_cv_my_have_imlib2}" != "no"; then
   AC_DEFINE(USE_IMLIB2, 1, Define to 1 to use Imlib2)

libpipi/trunk/pipi/Makefile.am

@@ -47 +47 @@
 
 if USE_OPENCV
-codec_cflags += `opencv-config --cflags`
-codec_libs += `opencv-config --libs opencv highgui`
+codec_cflags += @OPENCV_CFLAGS@
+codec_libs += @OPENCV_LIBS@
 codec_sources += codec/opencv.c
 endif