gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "fltk-config reports dep on gtk3 when it does not exist" (#1201)

Browse Source
This commit is contained in:
ManoloFLTK 2025-02-14 16:14:39 +01:00
parent 81a5736006
commit 4c64264e0c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -1128,6 +1128,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
])
AS_IF([$PKGCONFIG --exists 'libdecor-0 >= 0.2.0'],
[
libdecor="system"
plugin_dir="$($PKGCONFIG --variable=libdir libdecor-0)/libdecor/plugins-1"
CFLAGS="$CFLAGS -DUSE_SYSTEM_LIBDECOR"
CXXFLAGS="$CXXFLAGS -DUSE_SYSTEM_LIBDECOR"
@ -1135,6 +1136,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
LIBS="$LIBS $($PKGCONFIG --libs libdecor-0)"
],
[
libdecor="bundled"
CFLAGS="$CFLAGS -DUSE_SYSTEM_LIBDECOR=0 -DLIBDECOR_PLUGIN_DIR=\\\"\\\" "
CXXFLAGS="$CXXFLAGS -DUSE_SYSTEM_LIBDECOR=0"
]
@ -1172,13 +1174,15 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
GLDEMOS=""
])
dnl Check for GTK-3 ...
gtk_found=no
CFLAGS="$($PKGCONFIG --cflags gtk+-3.0) $CFLAGS"
AC_CHECK_HEADERS([gtk/gtk.h], [
CFLAGS="$CFLAGS -DHAVE_GTK"
LIBS="$LIBS $($PKGCONFIG --libs gtk+-3.0)"
gtk_found=yes
AS_IF([test x$libdecor = xbundled], [
dnl Check for GTK-3 ...
gtk_found=no
CFLAGS="$($PKGCONFIG --cflags gtk+-3.0) $CFLAGS"
AC_CHECK_HEADERS([gtk/gtk.h], [
CFLAGS="$CFLAGS -DHAVE_GTK"
LIBS="$LIBS $($PKGCONFIG --libs gtk+-3.0)"
gtk_found=yes
])
])
dnl Check for the Pango library ...