From bc25e1bc0e4db227c433f6acba69f7c032047f3f Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 8 Oct 2019 09:39:45 +0200 Subject: [PATCH] Configure: do not depend on pkg-config GPUJPEG cmake doesn't currently install the pkg-config file. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 22281f886..a2b151c7c 100644 --- a/configure.ac +++ b/configure.ac @@ -2037,9 +2037,11 @@ CFLAGS=$SAVED_CFLAGS CXXFLAGS=$SAVED_CXXFLAGS CPPFLAGS=$SAVED_CPPFLAGS -if test $system = Windows +PKG_CHECK_MODULES([LIBGPUJPEG], [libgpujpeg >= 0.0.2 ], [found_gpujpeg=yes], [found_gpujpeg=no]) + +if test "$found_gpujpeg" != yes then - GPUJPEG_LIB="$GPUJPEG_LIB -Lgpujpeg/Release -lgpujpeg" + GPUJPEG_LIB="$GPUJPEG_LIB -lgpujpeg" SAVED_LIBS=$LIBS LIBS="$LIBS $GPUJPEG_LIB" AC_CHECK_LIB([gpujpeg], [gpujpeg_encoder_create]) @@ -2052,8 +2054,6 @@ then else found_gpujpeg=no fi -else - PKG_CHECK_MODULES([LIBGPUJPEG], [libgpujpeg >= 0.0.2 ], [found_gpujpeg=yes], [found_gpujpeg=no]) fi if test "$gpujpeg_req" != no -a \