Changeset 389 for pwntcha/trunk/configure.acTweet

Timestamp:

Jan 3, 2005, 10:48:54 PM (16 years ago)

Author:

Sam Hocevar

Message:

• use OpenCV rather than Imlib2 if both are available.
• cleaned up the slashdot code.
• decode phpBB captchas.
• added filter_contrast.

File:

• pwntcha/trunk/configure.ac (modified) (2 diffs)

pwntcha/trunk/configure.ac

@@ -19 +19 @@
 AC_TYPE_SIZE_T
 
+# 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}"
+AM_CONDITIONAL(USE_OPENCV, test "${ac_cv_my_have_opencv}" = "yes")
+
 # Use Imlib2?
 ac_cv_my_have_imlib2="no"
@@ -32 +45 @@
 AM_CONDITIONAL(USE_IMLIB2, test "${ac_cv_my_have_imlib2}" = "yes")
 
-# Use Imlib2?
-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}"
-AM_CONDITIONAL(USE_OPENCV, test "${ac_cv_my_have_opencv}" = "yes")
-
 if test "${ac_cv_my_have_imlib2}" = "no" -a "${ac_cv_my_have_opencv}" = "no"; then
   AC_MSG_ERROR([[cannot find Imlib2 or OpenCV, please install one of them]])