Hi,
Here is a patch to enable experimental FLTK 1.4.X support which adds a
'--enable-fltk14' flag to 'configure'. By default we still use 1.3.X.
This addresses bug #509:
https://bug.dillo-browser.org/509/
--- a/configure.ac Tue Nov 11 13:06:16 2025
+++ b/configure.ac Fri Nov 21 10:48:50 2025
@@ -115,6 +115,11 @@ AC_ARG_ENABLE([brotli],
[enable_brotli=$enableval],
[enable_brotli=yes])
+AC_ARG_ENABLE([fltk14],
+ [AS_HELP_STRING([--enable-fltk14], [Enable FLTK 1.4.X (EXPERIMENTAL)])],
+ [enable_fltk14=$enableval],
+ [enable_fltk14=no])
+
AC_ARG_WITH([ca-certs-file],
[AS_HELP_STRING([--with-ca-certs-file=FILE], [Specify where to find a bundle
of trusted CA certificates for TLS])],
CA_CERTS_FILE=$withval)
@@ -225,25 +230,39 @@ fi
dnl -------------------------
-dnl Test for FLTK 1.3 library
+dnl Test for FLTK library
dnl -------------------------
dnl
dnl For debugging and to be user friendly
-AC_PATH_PROGS(FLTK_CONFIG,[fltk-config1.3 fltk-config])
-AC_MSG_CHECKING([FLTK 1.3])
+AC_PATH_PROGS(FLTK_CONFIG,[fltk-config1.3 fltk-config1.4 fltk-config])
fltk_version="`$FLTK_CONFIG --version 2>/dev/null`"
-case $fltk_version in
- 1.3.*) AC_MSG_RESULT(yes)
+if test "x$enable_fltk14" = "xyes"; then
+ AC_MSG_CHECKING([FLTK 1.4.X])
+ case $fltk_version in
+ 1.4.*) AC_MSG_RESULT(yes)
LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
- 1.4.*) AC_MSG_RESULT(no)
- AC_MSG_ERROR([FLTK $fltk_version not supported yet; use FLTK 1.3]);;
?*) AC_MSG_RESULT(no)
- AC_MSG_ERROR(FLTK 1.3 required; version found: $fltk_version);;
+ AC_MSG_ERROR(FLTK 1.4.X required; version found: $fltk_version);;
*) AC_MSG_RESULT(no)
- AC_MSG_ERROR(FLTK 1.3 required; fltk-config not found)
-esac
+ AC_MSG_ERROR(FLTK 1.4.X required; fltk-config not found)
+ esac
+else
+ AC_MSG_CHECKING([FLTK 1.3])
+ case $fltk_version in
+ 1.3.*) AC_MSG_RESULT(yes)
+ LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
+ LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
+ LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
+ 1.4.*) AC_MSG_RESULT(no)
+ AC_MSG_ERROR([FLTK $fltk_version not supported yet; use FLTK 1.3]);;
+ ?*) AC_MSG_RESULT(no)
+ AC_MSG_ERROR(FLTK 1.3 required; version found: $fltk_version);;
+ *) AC_MSG_RESULT(no)
+ AC_MSG_ERROR(FLTK 1.3 required; fltk-config not found)
+ esac
+fi
dnl -----------------------------------
dnl Test for X11 (only on some systems)
Regards,
Alex
--- a/configure.ac Tue Nov 11 13:06:16 2025
+++ b/configure.ac Fri Nov 21 10:48:50 2025
@@ -115,6 +115,11 @@ AC_ARG_ENABLE([brotli],
[enable_brotli=$enableval],
[enable_brotli=yes])
+AC_ARG_ENABLE([fltk14],
+ [AS_HELP_STRING([--enable-fltk14], [Enable FLTK 1.4.X (EXPERIMENTAL)])],
+ [enable_fltk14=$enableval],
+ [enable_fltk14=no])
+
AC_ARG_WITH([ca-certs-file],
[AS_HELP_STRING([--with-ca-certs-file=FILE], [Specify where to find a bundle of trusted CA certificates for TLS])],
CA_CERTS_FILE=$withval)
@@ -225,25 +230,39 @@ fi
dnl -------------------------
-dnl Test for FLTK 1.3 library
+dnl Test for FLTK library
dnl -------------------------
dnl
dnl For debugging and to be user friendly
-AC_PATH_PROGS(FLTK_CONFIG,[fltk-config1.3 fltk-config])
-AC_MSG_CHECKING([FLTK 1.3])
+AC_PATH_PROGS(FLTK_CONFIG,[fltk-config1.3 fltk-config1.4 fltk-config])
fltk_version="`$FLTK_CONFIG --version 2>/dev/null`"
-case $fltk_version in
- 1.3.*) AC_MSG_RESULT(yes)
+if test "x$enable_fltk14" = "xyes"; then
+ AC_MSG_CHECKING([FLTK 1.4.X])
+ case $fltk_version in
+ 1.4.*) AC_MSG_RESULT(yes)
LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
- 1.4.*) AC_MSG_RESULT(no)
- AC_MSG_ERROR([FLTK $fltk_version not supported yet; use FLTK 1.3]);;
?*) AC_MSG_RESULT(no)
- AC_MSG_ERROR(FLTK 1.3 required; version found: $fltk_version);;
+ AC_MSG_ERROR(FLTK 1.4.X required; version found: $fltk_version);;
*) AC_MSG_RESULT(no)
- AC_MSG_ERROR(FLTK 1.3 required; fltk-config not found)
-esac
+ AC_MSG_ERROR(FLTK 1.4.X required; fltk-config not found)
+ esac
+else
+ AC_MSG_CHECKING([FLTK 1.3])
+ case $fltk_version in
+ 1.3.*) AC_MSG_RESULT(yes)
+ LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
+ LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
+ LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
+ 1.4.*) AC_MSG_RESULT(no)
+ AC_MSG_ERROR([FLTK $fltk_version not supported yet; use FLTK 1.3]);;
+ ?*) AC_MSG_RESULT(no)
+ AC_MSG_ERROR(FLTK 1.3 required; version found: $fltk_version);;
+ *) AC_MSG_RESULT(no)
+ AC_MSG_ERROR(FLTK 1.3 required; fltk-config not found)
+ esac
+fi
dnl -----------------------------------
dnl Test for X11 (only on some systems)
_______________________________________________
Dillo-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
