wok view idesk/stuff/configure.in.patch @ rev 24990
idesk: imlib2 >= 1.7.5 support
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri May 13 20:03:04 2022 +0000 (24 months ago) |
| parents | |
| children |
line source
1 --- configure.in
2 +++ configure.in
3 @@ -94,21 +94,15 @@
5 dnl Imlib2 detection
7 -AC_PATH_GENERIC(imlib2, , [
8 - AC_SUBST(IMLIB_LIBS)
9 - AC_SUBST(IMLIB_CXXFLAGS) ],
10 - AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?
11 - You need Imlib2 to build Idesk. Verify that you have Imlib2-dev))
12 -
13 -dnl the above doesn't work for some reason :/
14 -IMLIB_LIBS=`imlib2-config --libs`
15 -IMLIB_CFLAGS=`imlib2-config --cflags`
16 -AC_SUBST(IMLIB_LIBS)
17 -AC_SUBST(IMLIB_CXXFLAGS)
18 -
19 -CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS"
20 -LIBS="$LIBS $IMLIB_LIBS"
21 +PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2_pkgconfig=yes], [imlib2_pkgconfig=no])
22 +if test "x$imlib2_pkgconfig" = "xyes"; then
23 + AC_DEFINE(HAVE_IMLIB2, 1, [Define to 1 if you have imlib2])
24 +fi
25 +AC_SUBST(IMLIB2_LIBS)
26 +AC_SUBST(IMLIB2_CXXFLAGS)
28 +CXXFLAGS="$CXXFLAGS $IMLIB2_CXXFLAGS"
29 +LIBS="$LIBS $IMLIB2_LIBS"
31 dnl Check for libsn Startup Notificacion options
32 STARTUP=""