wok annotate idesk/stuff/configure.in.patch @ rev 25067
updated alsa-plugins (1.1.5 -> 1.2.6)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Fri Jun 10 13:40:50 2022 +0100 (2022-06-10) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@24990 | 1 --- configure.in |
| pascal@24990 | 2 +++ configure.in |
| pascal@24990 | 3 @@ -94,21 +94,15 @@ |
| pascal@24990 | 4 |
| pascal@24990 | 5 dnl Imlib2 detection |
| pascal@24990 | 6 |
| pascal@24990 | 7 -AC_PATH_GENERIC(imlib2, , [ |
| pascal@24990 | 8 - AC_SUBST(IMLIB_LIBS) |
| pascal@24990 | 9 - AC_SUBST(IMLIB_CXXFLAGS) ], |
| pascal@24990 | 10 - AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path? |
| pascal@24990 | 11 - You need Imlib2 to build Idesk. Verify that you have Imlib2-dev)) |
| pascal@24990 | 12 - |
| pascal@24990 | 13 -dnl the above doesn't work for some reason :/ |
| pascal@24990 | 14 -IMLIB_LIBS=`imlib2-config --libs` |
| pascal@24990 | 15 -IMLIB_CFLAGS=`imlib2-config --cflags` |
| pascal@24990 | 16 -AC_SUBST(IMLIB_LIBS) |
| pascal@24990 | 17 -AC_SUBST(IMLIB_CXXFLAGS) |
| pascal@24990 | 18 - |
| pascal@24990 | 19 -CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS" |
| pascal@24990 | 20 -LIBS="$LIBS $IMLIB_LIBS" |
| pascal@24990 | 21 +PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2_pkgconfig=yes], [imlib2_pkgconfig=no]) |
| pascal@24990 | 22 +if test "x$imlib2_pkgconfig" = "xyes"; then |
| pascal@24990 | 23 + AC_DEFINE(HAVE_IMLIB2, 1, [Define to 1 if you have imlib2]) |
| pascal@24990 | 24 +fi |
| pascal@24990 | 25 +AC_SUBST(IMLIB2_LIBS) |
| pascal@24990 | 26 +AC_SUBST(IMLIB2_CXXFLAGS) |
| pascal@24990 | 27 |
| pascal@24990 | 28 +CXXFLAGS="$CXXFLAGS $IMLIB2_CXXFLAGS" |
| pascal@24990 | 29 +LIBS="$LIBS $IMLIB2_LIBS" |
| pascal@24990 | 30 |
| pascal@24990 | 31 dnl Check for libsn Startup Notificacion options |
| pascal@24990 | 32 STARTUP="" |