1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Description: Use pkg-config to locate imlib2
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Bug-Debian: https://bugs.debian.org/1018029
Forwarded: no
Last-Update: 2022-12-31
--- a/configure.in
+++ b/configure.in
@@ -91,24 +91,17 @@ fi
AC_SUBST(SHAPE)
CXXFLAGS="$CXXFLAGS $SHAPE"
LIBS="$LIBS $Xext_lib"
dnl Imlib2 detection
-
-AC_PATH_GENERIC(imlib2, , [
- AC_SUBST(IMLIB_LIBS)
- AC_SUBST(IMLIB_CXXFLAGS) ],
- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?
+PKG_PROG_PKG_CONFIG()
+PKG_CHECK_MODULES(IMLIB, [imlib2],
+ AC_MSG_RESULT([found imlib2 ${IMLIB_VERSION}]),
+ AC_MSG_ERROR(Cannot find imlib2:
You need Imlib2 to build Idesk. Verify that you have Imlib2-dev))
-dnl the above doesn't work for some reason :/
-IMLIB_LIBS=`imlib2-config --libs`
-IMLIB_CFLAGS=`imlib2-config --cflags`
-AC_SUBST(IMLIB_LIBS)
-AC_SUBST(IMLIB_CXXFLAGS)
-
-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS"
+CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS"
LIBS="$LIBS $IMLIB_LIBS"
dnl Check for libsn Startup Notificacion options
STARTUP=""
|
