From 5eb7af95fa6c3d4ada40689240eadecbb8ccaed4 Mon Sep 17 00:00:00 2001
From: Charles Ballard <charles.ballard@stfc.ac.uk>
Date: Tue, 24 Oct 2023 15:19:14 +0100
Subject: [PATCH] [py39]..3120: cootapi, new
---
ccp4.xml | 59 ++
patches/coot-freetype.patch | 227 +++++
patches/cootapi-no-goocanvas.patch | 1286 ++++++++++++++++++++++++++++
3 files changed, 1572 insertions(+)
create mode 100644 patches/cootapi-no-goocanvas.patch
diff --git a/ccp4.xml b/ccp4.xml
index 7dda3806..41434ab5 100644
--- a/ccp4.xml
+++ b/ccp4.xml
@@ -1556,6 +1556,7 @@ install intltool libfontconfig1-dev libxrender-dev
</dependencies>
<after>
<dep package="curl"/>
+ <depends package="gtk3"/>
</after>
</autotools>
</if>
@@ -1606,10 +1607,68 @@ install intltool libfontconfig1-dev libxrender-dev
<if condition-set="darwin">
<dep package="intltool"/>
</if>
+ <depends package="gtk3"/>
</after>
</autotools>
</if>
+<if condition-unset="Windows">
+ <autotools id="cootapi"
+ supports-non-srcdir-builds="no"
+ autogen-sh="autogen.sh && patch -p 0 < ../../patches/coot-macros-python-m4.patch && patch -p 0 < ../../patches/coot-coot-in.patch && patch -p 0 < ../../patches/coot-freetype.patch && patch -p 0 < ../../patches/coot-ud-colour-rule.patch && patch -p1 < ../../patches/coot-lbg-qed.patch && patch -p 1 < ../../patches/coot-lidia-launcher.patch && patch -p 1 < ../../patches/coot-M2T.patch && patch -p 0 < ../../patches/cootapi-no-goocanvas.patch &&./configure "
+ autogenargs="--prefix=${prefix} --enable-libcootapi-only --with-modern-language-tools --with-python --includedir=${prefix}/include/coot COOT_BUILD_INFO_STRING='CCP4, Oxfordshire'">
+ <branch repo="github"
+ module="pemsley/coot.git"
+ tag="gtk3"
+ checkoutdir="cootapi"
+ version="1.0a">
+ <patch file="coot-coot-in.patch" strip="0" />
+ <patch file="coot-macros-python-m4.patch" strip="0" />
+ <patch file="coot-freetype.patch" strip="0" />
+ <patch file="coot-ud-colour-rule.patch" strip="0" />
+ <patch file="coot-lbg-qed.patch" strip="1" />
+ <patch file="coot-lidia-launcher.patch" strip="1" />
+ <patch file="coot-M2T.patch" strip="1" />
+ <patch file="cootapi-no-goocanvas.patch" strip="0" />
+ </branch>
+ <dependencies>
+ <dep package="swig"/>
+ <dep package="ssm"/>
+ <dep package="mmdb2"/>
+ <dep package="clipper"/>
+ <dep package="monomers"/>
+ <dep package="coot-reference-structures"/>
+ <dep package="gsl"/>
+ <dep package="glm"/>
+ <dep package="rdkit"/>
+ </dependencies>
+ <after>
+ </after>
+ </autotools>
+</if>
+<if condition-set="Windows">
+ <autotools id="cootapi"
+ supports-non-srcdir-builds="no"
+ autogen-sh="autogen.sh && ./configure "
+ autogenargs="--prefix=${drive-prefix} --enable-libcootapi-only --with-modern-language-tools --with-python --includedir=${drive-prefix}/include/coot COOT_BUILD_INFO_STRING='CCP4, Oxfordshire'">
+ <branch repo="github"
+ module="pemsley/coot.git"
+ tag="gtk3"
+ checkoutdir="cootapi"
+ version="1.0a">
+ </branch>
+ <dependencies>
+ <dep package="swig"/>
+ <dep package="ssm"/>
+ <dep package="mmdb2"/>
+ <dep package="clipper"/>
+ <dep package="monomers"/>
+ <dep package="coot-reference-structures"/>
+ <dep package="curl"/>
+ </dependencies>
+ </autotools>
+</if>
+
<distutils id="mrcfile"
distinstallargs="--install-scripts=${drive-prefix}/libexec ">
<if condition-set='darwin'>
diff --git a/patches/coot-freetype.patch b/patches/coot-freetype.patch
index cef738df..8eb8caa4 100644
--- a/patches/coot-freetype.patch
+++ b/patches/coot-freetype.patch
@@ -20,3 +20,230 @@
$(SQLITE3_LIBS) \
@GTK_LIBS@ \
$(GOOCANVAS_LIBS) \
+--- configure.orig 2023-05-30 16:34:44.000000000 +0100
++++ configure 2023-05-31 10:27:16.000000000 +0100
+@@ -705,6 +705,10 @@
+ USE_BACKWARD_TRUE
+ SQLITE3_LIBS
+ SQLITE3_CFLAGS
++EPOXY_LIBS
++EPOXY_CFLAGS
++FREETYPE_LIBS
++FREETYPE_CFLAGS
+ CAIRO_LIBS
+ CAIRO_CFLAGS
+ LIBPNG_LIBS
+@@ -912,6 +916,10 @@
+ LIBPNG_LIBS
+ CAIRO_CFLAGS
+ CAIRO_LIBS
++FREETYPE_CFLAGS
++FREETYPE_LIBS
++EPOXY_CFLAGS
++EPOXY_LIBS
+ GTK_CFLAGS
+ GTK_LIBS
+ GOOCANVAS_CFLAGS
+@@ -1620,6 +1628,13 @@
+ CAIRO_CFLAGS
+ C compiler flags for CAIRO, overriding pkg-config
+ CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
++ FREETYPE_CFLAGS
++ C compiler flags for FREETYPE, overriding pkg-config
++ FREETYPE_LIBS
++ linker flags for FREETYPE, overriding pkg-config
++ EPOXY_CFLAGS
++ C compiler flags for EPOXY, overriding pkg-config
++ EPOXY_LIBS linker flags for EPOXY, overriding pkg-config
+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+ GTK_LIBS linker flags for GTK, overriding pkg-config
+ GOOCANVAS_CFLAGS
+@@ -17927,6 +17942,188 @@
+
+
+
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
++$as_echo_n "checking for FREETYPE... " >&6; }
++
++if test -n "$FREETYPE_CFLAGS"; then
++ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 \""; } >&5
++ ($PKG_CONFIG --exists --print-errors "freetype2 ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 " 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$FREETYPE_LIBS"; then
++ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 \""; } >&5
++ ($PKG_CONFIG --exists --print-errors "freetype2 ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 " 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 " 2>&1`
++ else
++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$FREETYPE_PKG_ERRORS" >&5
++
++ as_fn_error $? "Package requirements (freetype2 ) were not met:
++
++$FREETYPE_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables FREETYPE_CFLAGS
++and FREETYPE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables FREETYPE_CFLAGS
++and FREETYPE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
++else
++ FREETYPE_CFLAGS=$pkg_cv_FREETYPE_CFLAGS
++ FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EPOXY" >&5
++$as_echo_n "checking for EPOXY... " >&6; }
++
++if test -n "$EPOXY_CFLAGS"; then
++ pkg_cv_EPOXY_CFLAGS="$EPOXY_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy \""; } >&5
++ ($PKG_CONFIG --exists --print-errors "epoxy ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_EPOXY_CFLAGS=`$PKG_CONFIG --cflags "epoxy " 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$EPOXY_LIBS"; then
++ pkg_cv_EPOXY_LIBS="$EPOXY_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"epoxy \""; } >&5
++ ($PKG_CONFIG --exists --print-errors "epoxy ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_EPOXY_LIBS=`$PKG_CONFIG --libs "epoxy " 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ EPOXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "epoxy " 2>&1`
++ else
++ EPOXY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "epoxy " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$EPOXY_PKG_ERRORS" >&5
++
++ as_fn_error $? "Package requirements (epoxy ) were not met:
++
++$EPOXY_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables EPOXY_CFLAGS
++and EPOXY_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables EPOXY_CFLAGS
++and EPOXY_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
++else
++ EPOXY_CFLAGS=$pkg_cv_EPOXY_CFLAGS
++ EPOXY_LIBS=$pkg_cv_EPOXY_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++
+
+ # Check whether --with-sqlite3 was given.
+ if test "${with_sqlite3+set}" = set; then :
diff --git a/patches/cootapi-no-goocanvas.patch b/patches/cootapi-no-goocanvas.patch
new file mode 100644
index 00000000..087433d7
--- /dev/null
+++ b/patches/cootapi-no-goocanvas.patch
@@ -0,0 +1,1286 @@
+--- configure.ac.orig 2023-05-31 13:11:38.000000000 +0100
++++ configure.ac 2023-06-01 12:40:15.000000000 +0100
+@@ -93,17 +93,6 @@
+ eval EXPORT_DYNAMIC_FLAG_SPEC=$export_dynamic_flag_spec
+ AC_SUBST(EXPORT_DYNAMIC_FLAG_SPEC)
+
+-
+-dnl We need to put a PKG_CHECK_MODULES in early so that pkg-config is
+-dnl setup first (it seems to be a side-effect of using PKG_CHECK_MODULES),
+-dnl setting ac_cv_env_PKG_CONFIG and related. This is because the conditional
+-dnl use of PKG_CHECK_MODULES for GPP4 causes problems when setting up pkg-config
+-dnl
+-dnl So, let's check GLIB here, should be harmless.
+-dnl
+-PKG_CHECK_MODULES([GLIB], [glib-2.0])
+-
+-
+ dnl test for WINDOWS_MINGW
+ AM_MINGW_WINDOWS
+ dnl test for LIBPNG (Windows only - maybe shouif here rather than in macro?)
+@@ -122,10 +111,6 @@
+ LIBPNG_CFLAGS="-DUSE_LIBPNG=1 $LIBPNG_CFLAGS"
+ fi
+
+-# and while we are thinking about images, let's check for Cairo also
+-PKG_CHECK_MODULES([CAIRO], [cairo >= 1.14])
+-
+-
+ PKG_CHECK_MODULES([FREETYPE], [freetype2] )
+ PKG_CHECK_MODULES([EPOXY], [epoxy] )
+ AM_PATH_SQLITE3
+@@ -205,26 +190,13 @@
+ AX_PATH_GSL([1.3],[COOT_GSL_FLAGS=-DHAVE_GSL],[COOT_GSL_FLAGS=""])
+ AC_SUBST(COOT_GSL_FLAGS)
+
+-#GLM
+-AC_LANG_PUSH(C++)
+-AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(GLM headers are required.))
++#GLM
++AC_LANG_PUSH(C++)
++AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(GLM headers are required.))
+ AC_LANG_POP
+
+-
+ dnl =========================== GTK, GOOCANVAS ===========================
+
+-AC_ARG_WITH(gtk4, [ --gtk4 build coot with gtk4 ], with_gtk4="yes", with_gtk4="no")
+-
+-if test $with_gtk4 = yes ; then
+- PKG_CHECK_MODULES(GTK, gtk4 >= 4.1)
+-else
+- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.18)
+-fi
+-
+-# goocanvas for GTK4?
+-PKG_CHECK_MODULES([GOOCANVAS], [goocanvas-2.0])
+-
+-
+ # this needs a rethink
+ MAKE_COOTRC_CMD="sed -e 's/\#GTK2 //' "
+ AC_SUBST(MAKE_COOTRC_CMD)
+@@ -269,29 +241,6 @@
+ AC_SUBST(L_BOOST_PYTHON)
+
+
+-# Goocanvas is no longer optional
+-# AM_PATH_GOOCANVAS
+-# if test "$GOOCANVAS_CFLAGS" != "" ; then
+-# GOOCANVAS_CFLAGS="-DHAVE_GOOCANVAS $GOOCANVAS_CFLAGS"
+-# fi
+-
+-# this can go away in 2020 - no one will try to use that old RDKit.
+-#
+-# was RDKIT used and if it was does it have Cairo support (if it does
+-# have cairo support, we can use it to generate molecular (chemical)
+-# depictions.
+-#
+-if test -n "$RDKIT_LIBS" ; then
+-
+- case "$RDKIT_LIBS" in
+-
+- *MolDraw2D*)
+- RDKIT_CXXFLAGS="$RDKIT_CXXFLAGS -DRDKIT_HAS_CAIRO_SUPPORT"
+- ;;
+- esac
+-fi
+-
+-
+ AC_ARG_WITH(enhanced-ligand-tools, [ --with-enhanced-ligand-tools with optional ligand-related dependencies ],
+ coot_enhanced_ligand_additions="true",
+ coot_enhanced_ligand_additions="false")
+--- configure.orig 2023-05-31 13:11:38.000000000 +0100
++++ configure 2023-06-01 12:40:24.000000000 +0100
+@@ -672,10 +672,6 @@
+ PYTHON_VERSION
+ PYTHON
+ MAKE_COOTRC_CMD
+-GOOCANVAS_LIBS
+-GOOCANVAS_CFLAGS
+-GTK_LIBS
+-GTK_CFLAGS
+ COOT_GSL_FLAGS
+ GSL_LIBS
+ GSL_CFLAGS
+@@ -709,10 +705,11 @@
+ EPOXY_CFLAGS
+ FREETYPE_LIBS
+ FREETYPE_CFLAGS
+-CAIRO_LIBS
+-CAIRO_CFLAGS
+ LIBPNG_LIBS
+ LIBPNG_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
++PKG_CONFIG
+ GLOB_LIBS
+ GLOB_CFLAGS
+ SHARED_LDFLAGS
+@@ -722,11 +719,6 @@
+ OS_WIN64_TRUE
+ OS_WIN32_FALSE
+ OS_WIN32_TRUE
+-GLIB_LIBS
+-GLIB_CFLAGS
+-PKG_CONFIG_LIBDIR
+-PKG_CONFIG_PATH
+-PKG_CONFIG
+ EXPORT_DYNAMIC_FLAG_SPEC
+ COOT_STDTYPES
+ HAVE_CXX11
+@@ -883,12 +875,10 @@
+ with_gsl_prefix
+ with_gsl_exec_prefix
+ enable_gsltest
+-with_gtk4
+ with_boost
+ with_boost_libdir
+ with_boost_python
+ with_enhanced_ligand_tools
+-with_rdkit_prefix
+ enable_lidia_only
+ enable_libcootapi_only
+ with_database
+@@ -910,20 +900,12 @@
+ PKG_CONFIG
+ PKG_CONFIG_PATH
+ PKG_CONFIG_LIBDIR
+-GLIB_CFLAGS
+-GLIB_LIBS
+ LIBPNG_CFLAGS
+ LIBPNG_LIBS
+-CAIRO_CFLAGS
+-CAIRO_LIBS
+ FREETYPE_CFLAGS
+ FREETYPE_LIBS
+ EPOXY_CFLAGS
+ EPOXY_LIBS
+-GTK_CFLAGS
+-GTK_LIBS
+-GOOCANVAS_CFLAGS
+-GOOCANVAS_LIBS
+ PYTHON_VERSION'
+
+
+@@ -1585,7 +1567,6 @@
+ --with-guile=PFX Prefix where GUILE has been installed
+ --with-gsl-prefix=PFX Prefix where GSL is installed (optional)
+ --with-gsl-exec-prefix=PFX Exec prefix where GSL is installed (optional)
+- --gtk4 build coot with gtk4
+ --with-boost[=ARG] use Boost library from a standard location
+ (ARG=yes), from the specified location (ARG=<path>),
+ or disable it (ARG=no) [ARG=yes]
+@@ -1598,7 +1579,6 @@
+ --with-boost-python specify yes/no or the boost python library or suffix
+ to use
+ --with-enhanced-ligand-tools with optional ligand-related dependencies
+-location of the RDKit package
+ --with-database link with MYSQL database?
+
+ Some influential environment variables:
+@@ -1620,14 +1600,9 @@
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
+- GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+- GLIB_LIBS linker flags for GLIB, overriding pkg-config
+ LIBPNG_CFLAGS
+ C compiler flags for LIBPNG, overriding pkg-config
+ LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config
+- CAIRO_CFLAGS
+- C compiler flags for CAIRO, overriding pkg-config
+- CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
+ FREETYPE_CFLAGS
+ C compiler flags for FREETYPE, overriding pkg-config
+ FREETYPE_LIBS
+@@ -1635,12 +1610,6 @@
+ EPOXY_CFLAGS
+ C compiler flags for EPOXY, overriding pkg-config
+ EPOXY_LIBS linker flags for EPOXY, overriding pkg-config
+- GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+- GTK_LIBS linker flags for GTK, overriding pkg-config
+- GOOCANVAS_CFLAGS
+- C compiler flags for GOOCANVAS, overriding pkg-config
+- GOOCANVAS_LIBS
+- linker flags for GOOCANVAS, overriding pkg-config
+ PYTHON_VERSION
+ The installed Python version to use, for example '2.3'. This
+ string will be appended to the Python interpreter canonical
+@@ -17381,6 +17350,162 @@
+
+
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if this is MINGW on Windows" >&5
++$as_echo_n "checking if this is MINGW on Windows... " >&6; }
++
++ COOT_WINDOWS_CFLAGS=
++ COOT_WINDOWS_LDFLAGS=
++ SHARED_LDFLAGS=
++ have_windows_mingw=no
++ windows=false
++ have_win64=no
++
++ # BL: workaround needed for new MinGW
++ ac_cv_build_alias=${ac_cv_build_alias:=$build_alias}
++
++ case $ac_cv_build_alias in
++
++ *-mingw*)
++ COOT_WINDOWS_CFLAGS="-DWINDOWS_MINGW -DUSE_GNOME_CANVAS -D_USE_MATH_DEFINES"
++ # BL says:: may need rethink for shared compilation of course!!
++ COOT_WINDOWS_LDFLAGS="-shared-libgcc -static-libstdc++"
++ if test $enable_shared = yes ; then
++ SHARED_LDFLAGS="-no-undefined -Wl,--export-all-symbols"
++ COOT_WINDOWS_LDFLAGS="-shared-libgcc"
++ fi
++ have_windows_mingw=yes
++ windows=true
++ ;;
++ esac
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_windows_mingw" >&5
++$as_echo "$have_windows_mingw" >&6; }
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if this is msys2 windows 64" >&5
++$as_echo_n "checking if this is msys2 windows 64... " >&6; }
++ case $ac_cv_build_alias in
++
++ *x86_64-*mingw*)
++ have_win64=yes
++ ;;
++ esac
++
++ if test x$windows = xtrue; then
++ OS_WIN32_TRUE=
++ OS_WIN32_FALSE='#'
++else
++ OS_WIN32_TRUE='#'
++ OS_WIN32_FALSE=
++fi
++
++ if test x$have_win64 = xyes; then
++ OS_WIN64_TRUE=
++ OS_WIN64_FALSE='#'
++else
++ OS_WIN64_TRUE='#'
++ OS_WIN64_FALSE=
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_win64" >&5
++$as_echo "$have_win64" >&6; }
++
++
++
++
++
++if test "$have_windows_mingw" = yes; then
++
++
++
++
++# Check whether --with-glob-prefix was given.
++if test "${with_glob_prefix+set}" = set; then :
++ withval=$with_glob_prefix; glob_prefix="$withval"
++else
++ glob_prefix=""
++fi
++
++
++saved_LIBS="$LIBS"
++saved_CFLAGS="$CFLAGS"
++
++if test x$glob_prefix != x; then
++ ac_GLOB_CFLAGS="-I$glob_prefix/include"
++ ac_GLOB_LIBS="-L$glob_prefix/lib -lglob"
++else
++ ac_GLOB_CFLAGS=""
++ ac_GLOB_LIBS="-lglob"
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glob (in windows)" >&5
++$as_echo_n "checking for glob (in windows)... " >&6; }
++
++ LIBS="$save_LIBS $ac_GLOB_LIBS"
++ CFLAGS="$save_CXXFLAGS $ac_GLOB_CFLAGS"
++ #
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <glob.h>
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ have_generic_glob=yes
++else
++ have_generic_glob=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <glob.h>
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ have_glob=yes
++else
++ have_glob=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_glob" >&5
++$as_echo "$have_glob" >&6; }
++
++if test x$have_glob = xyes; then
++
++ GLOB_CFLAGS="$ac_GLOB_CFLAGS"
++ GLOB_LIBS="$ac_GLOB_LIBS"
++
++else
++
++ echo Oops couldnt find glob.h compilation will fail!
++
++fi
++
++LIBS="$saved_LIBS"
++CFLAGS="$saved_CFLAGS"
++
++
++
++
++
++ ac_config_files="$ac_config_files pyrogen/pyrogen.bat"
++
++fi
++
++# This seems not to be returning the correct value
++# AM_PATH_LIBPNG
++# so try this:
++
+
+
+
+@@ -17502,19 +17627,19 @@
+ fi
+
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
+-$as_echo_n "checking for GLIB... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPNG" >&5
++$as_echo_n "checking for LIBPNG... " >&6; }
+
+-if test -n "$GLIB_CFLAGS"; then
+- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
++if test -n "$LIBPNG_CFLAGS"; then
++ pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libpng >= 1.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
++ pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -17522,16 +17647,16 @@
+ else
+ pkg_failed=untried
+ fi
+-if test -n "$GLIB_LIBS"; then
+- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
++if test -n "$LIBPNG_LIBS"; then
++ pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libpng >= 1.2") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
++ pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -17552,22 +17677,22 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0" 2>&1`
++ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2" 2>&1`
+ else
+- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0" 2>&1`
++ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$GLIB_PKG_ERRORS" >&5
++ echo "$LIBPNG_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (glib-2.0) were not met:
++ as_fn_error $? "Package requirements (libpng >= 1.2) were not met:
+
+-$GLIB_PKG_ERRORS
++$LIBPNG_PKG_ERRORS
+
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-Alternatively, you may set the environment variables GLIB_CFLAGS
+-and GLIB_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables LIBPNG_CFLAGS
++and LIBPNG_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -17578,427 +17703,83 @@
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+-Alternatively, you may set the environment variables GLIB_CFLAGS
+-and GLIB_LIBS to avoid the need to call pkg-config.
++Alternatively, you may set the environment variables LIBPNG_CFLAGS
++and LIBPNG_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details" "$LINENO" 5; }
+ else
+- GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+- GLIB_LIBS=$pkg_cv_GLIB_LIBS
++ LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS
++ LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+ fi
++if test -z "$LIBPNG_LIBS" ; then
++ :
++else
++ LIBPNG_CFLAGS="-DUSE_LIBPNG=1 $LIBPNG_CFLAGS"
++fi
+
+
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
++$as_echo_n "checking for FREETYPE... " >&6; }
+
++if test -n "$FREETYPE_CFLAGS"; then
++ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 \""; } >&5
++ ($PKG_CONFIG --exists --print-errors "freetype2 ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 " 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$FREETYPE_LIBS"; then
++ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 \""; } >&5
++ ($PKG_CONFIG --exists --print-errors "freetype2 ") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 " 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if this is MINGW on Windows" >&5
+-$as_echo_n "checking if this is MINGW on Windows... " >&6; }
+
+- COOT_WINDOWS_CFLAGS=
+- COOT_WINDOWS_LDFLAGS=
+- SHARED_LDFLAGS=
+- have_windows_mingw=no
+- windows=false
+- have_win64=no
+
+- # BL: workaround needed for new MinGW
+- ac_cv_build_alias=${ac_cv_build_alias:=$build_alias}
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+- case $ac_cv_build_alias in
+-
+- *-mingw*)
+- COOT_WINDOWS_CFLAGS="-DWINDOWS_MINGW -DUSE_GNOME_CANVAS -D_USE_MATH_DEFINES"
+- # BL says:: may need rethink for shared compilation of course!!
+- COOT_WINDOWS_LDFLAGS="-shared-libgcc -static-libstdc++"
+- if test $enable_shared = yes ; then
+- SHARED_LDFLAGS="-no-undefined -Wl,--export-all-symbols"
+- COOT_WINDOWS_LDFLAGS="-shared-libgcc"
+- fi
+- have_windows_mingw=yes
+- windows=true
+- ;;
+- esac
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_windows_mingw" >&5
+-$as_echo "$have_windows_mingw" >&6; }
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if this is msys2 windows 64" >&5
+-$as_echo_n "checking if this is msys2 windows 64... " >&6; }
+- case $ac_cv_build_alias in
+-
+- *x86_64-*mingw*)
+- have_win64=yes
+- ;;
+- esac
+-
+- if test x$windows = xtrue; then
+- OS_WIN32_TRUE=
+- OS_WIN32_FALSE='#'
+-else
+- OS_WIN32_TRUE='#'
+- OS_WIN32_FALSE=
+-fi
+-
+- if test x$have_win64 = xyes; then
+- OS_WIN64_TRUE=
+- OS_WIN64_FALSE='#'
+-else
+- OS_WIN64_TRUE='#'
+- OS_WIN64_FALSE=
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_win64" >&5
+-$as_echo "$have_win64" >&6; }
+-
+-
+-
+-
+-
+-if test "$have_windows_mingw" = yes; then
+-
+-
+-
+-
+-# Check whether --with-glob-prefix was given.
+-if test "${with_glob_prefix+set}" = set; then :
+- withval=$with_glob_prefix; glob_prefix="$withval"
+-else
+- glob_prefix=""
+-fi
+-
+-
+-saved_LIBS="$LIBS"
+-saved_CFLAGS="$CFLAGS"
+-
+-if test x$glob_prefix != x; then
+- ac_GLOB_CFLAGS="-I$glob_prefix/include"
+- ac_GLOB_LIBS="-L$glob_prefix/lib -lglob"
+-else
+- ac_GLOB_CFLAGS=""
+- ac_GLOB_LIBS="-lglob"
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glob (in windows)" >&5
+-$as_echo_n "checking for glob (in windows)... " >&6; }
+-
+- LIBS="$save_LIBS $ac_GLOB_LIBS"
+- CFLAGS="$save_CXXFLAGS $ac_GLOB_CFLAGS"
+- #
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <glob.h>
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- have_generic_glob=yes
+-else
+- have_generic_glob=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <glob.h>
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- have_glob=yes
+-else
+- have_glob=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_glob" >&5
+-$as_echo "$have_glob" >&6; }
+-
+-if test x$have_glob = xyes; then
+-
+- GLOB_CFLAGS="$ac_GLOB_CFLAGS"
+- GLOB_LIBS="$ac_GLOB_LIBS"
+-
+-else
+-
+- echo Oops couldnt find glob.h compilation will fail!
+-
+-fi
+-
+-LIBS="$saved_LIBS"
+-CFLAGS="$saved_CFLAGS"
+-
+-
+-
+-
+-
+- ac_config_files="$ac_config_files pyrogen/pyrogen.bat"
+-
+-fi
+-
+-# This seems not to be returning the correct value
+-# AM_PATH_LIBPNG
+-# so try this:
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPNG" >&5
+-$as_echo_n "checking for LIBPNG... " >&6; }
+-
+-if test -n "$LIBPNG_CFLAGS"; then
+- pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libpng >= 1.2") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_LIBPNG_CFLAGS=`$PKG_CONFIG --cflags "libpng >= 1.2" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$LIBPNG_LIBS"; then
+- pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng >= 1.2\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libpng >= 1.2") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_LIBPNG_LIBS=`$PKG_CONFIG --libs "libpng >= 1.2" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng >= 1.2" 2>&1`
+- else
+- LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng >= 1.2" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$LIBPNG_PKG_ERRORS" >&5
+-
+- as_fn_error $? "Package requirements (libpng >= 1.2) were not met:
+-
+-$LIBPNG_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables LIBPNG_CFLAGS
+-and LIBPNG_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables LIBPNG_CFLAGS
+-and LIBPNG_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+- LIBPNG_CFLAGS=$pkg_cv_LIBPNG_CFLAGS
+- LIBPNG_LIBS=$pkg_cv_LIBPNG_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-if test -z "$LIBPNG_LIBS" ; then
+- :
+-else
+- LIBPNG_CFLAGS="-DUSE_LIBPNG=1 $LIBPNG_CFLAGS"
+-fi
+-
+-# and while we are thinking about images, let's check for Cairo also
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
+-$as_echo_n "checking for CAIRO... " >&6; }
+-
+-if test -n "$CAIRO_CFLAGS"; then
+- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.14\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "cairo >= 1.14") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.14" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$CAIRO_LIBS"; then
+- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.14\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "cairo >= 1.14") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.14" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo >= 1.14" 2>&1`
+- else
+- CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo >= 1.14" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$CAIRO_PKG_ERRORS" >&5
+-
+- as_fn_error $? "Package requirements (cairo >= 1.14) were not met:
+-
+-$CAIRO_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables CAIRO_CFLAGS
+-and CAIRO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables CAIRO_CFLAGS
+-and CAIRO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+- CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
+- CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-
+-
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
+-$as_echo_n "checking for FREETYPE... " >&6; }
+-
+-if test -n "$FREETYPE_CFLAGS"; then
+- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 \""; } >&5
+- ($PKG_CONFIG --exists --print-errors "freetype2 ") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 " 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$FREETYPE_LIBS"; then
+- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 \""; } >&5
+- ($PKG_CONFIG --exists --print-errors "freetype2 ") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 " 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 " 2>&1`
+- else
+- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 " 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$FREETYPE_PKG_ERRORS" >&5
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 " 2>&1`
++ else
++ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 " 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$FREETYPE_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (freetype2 ) were not met:
+
+@@ -19053,296 +18834,6 @@
+
+
+
+-
+-
+-# Check whether --with-gtk4 was given.
+-if test "${with_gtk4+set}" = set; then :
+- withval=$with_gtk4; with_gtk4="yes"
+-else
+- with_gtk4="no"
+-fi
+-
+-
+-if test $with_gtk4 = yes ; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+-$as_echo_n "checking for GTK... " >&6; }
+-
+-if test -n "$GTK_CFLAGS"; then
+- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk4 >= 4.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gtk4 >= 4.1") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk4 >= 4.1" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GTK_LIBS"; then
+- pkg_cv_GTK_LIBS="$GTK_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk4 >= 4.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gtk4 >= 4.1") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk4 >= 4.1" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk4 >= 4.1" 2>&1`
+- else
+- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk4 >= 4.1" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GTK_PKG_ERRORS" >&5
+-
+- as_fn_error $? "Package requirements (gtk4 >= 4.1) were not met:
+-
+-$GTK_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GTK_CFLAGS
+-and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GTK_CFLAGS
+-and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+- GTK_LIBS=$pkg_cv_GTK_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-else
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
+-$as_echo_n "checking for GTK... " >&6; }
+-
+-if test -n "$GTK_CFLAGS"; then
+- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.18\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.18") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.18" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GTK_LIBS"; then
+- pkg_cv_GTK_LIBS="$GTK_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.18\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.18") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.18" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.18" 2>&1`
+- else
+- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.18" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GTK_PKG_ERRORS" >&5
+-
+- as_fn_error $? "Package requirements (gtk+-3.0 >= 3.18) were not met:
+-
+-$GTK_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GTK_CFLAGS
+-and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GTK_CFLAGS
+-and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+- GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+- GTK_LIBS=$pkg_cv_GTK_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-fi
+-
+-# goocanvas for GTK4?
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOOCANVAS" >&5
+-$as_echo_n "checking for GOOCANVAS... " >&6; }
+-
+-if test -n "$GOOCANVAS_CFLAGS"; then
+- pkg_cv_GOOCANVAS_CFLAGS="$GOOCANVAS_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"goocanvas-2.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "goocanvas-2.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GOOCANVAS_CFLAGS=`$PKG_CONFIG --cflags "goocanvas-2.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GOOCANVAS_LIBS"; then
+- pkg_cv_GOOCANVAS_LIBS="$GOOCANVAS_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"goocanvas-2.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "goocanvas-2.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GOOCANVAS_LIBS=`$PKG_CONFIG --libs "goocanvas-2.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GOOCANVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "goocanvas-2.0" 2>&1`
+- else
+- GOOCANVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "goocanvas-2.0" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GOOCANVAS_PKG_ERRORS" >&5
+-
+- as_fn_error $? "Package requirements (goocanvas-2.0) were not met:
+-
+-$GOOCANVAS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GOOCANVAS_CFLAGS
+-and GOOCANVAS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GOOCANVAS_CFLAGS
+-and GOOCANVAS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+- GOOCANVAS_CFLAGS=$pkg_cv_GOOCANVAS_CFLAGS
+- GOOCANVAS_LIBS=$pkg_cv_GOOCANVAS_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-fi
+-
+-
+ # this needs a rethink
+ MAKE_COOTRC_CMD="sed -e 's/\#GTK2 //' "
+
+@@ -19480,7 +18971,7 @@
+ PYTHON_EXEC_PREFIX='${exec_prefix}'
+
+
+- PYTHON_PREFIX=`$PYTHON -c "import sys, os; from distutils import sysconfig; path=sysconfig.PREFIX.replace(':','').split(os.sep); sys.stdout.write('/'+'/'.join(path))"`
++ PYTHON_PREFIX=`$PYTHON -c "import sys, os; from distutils import sysconfig; path=sysconfig.PREFIX.replace(':','').split(os.sep); sys.stdout.write('/'+'/'.join(path))"`
+ PYTHON_EXEC_PREFIX=`$PYTHON -c "import sys, os; from distutils import sysconfig; path=sysconfig.EXEC_PREFIX.replace(':','').split(os.sep); sys.stdout.write('/'+'/'.join(path))"`
+
+
+@@ -20423,29 +19914,6 @@
+
+
+
+-# Goocanvas is no longer optional
+-# AM_PATH_GOOCANVAS
+-# if test "$GOOCANVAS_CFLAGS" != "" ; then
+-# GOOCANVAS_CFLAGS="-DHAVE_GOOCANVAS $GOOCANVAS_CFLAGS"
+-# fi
+-
+-# this can go away in 2020 - no one will try to use that old RDKit.
+-#
+-# was RDKIT used and if it was does it have Cairo support (if it does
+-# have cairo support, we can use it to generate molecular (chemical)
+-# depictions.
+-#
+-if test -n "$RDKIT_LIBS" ; then
+-
+- case "$RDKIT_LIBS" in
+-
+- *MolDraw2D*)
+- RDKIT_CXXFLAGS="$RDKIT_CXXFLAGS -DRDKIT_HAS_CAIRO_SUPPORT"
+- ;;
+- esac
+-fi
+-
+-
+
+ # Check whether --with-enhanced-ligand-tools was given.
+ if test "${with_enhanced_ligand_tools+set}" = set; then :
+--- Makefile.am.orig 2023-05-31 12:38:14.022828400 +0100
++++ Makefile.am 2023-05-31 12:38:50.040198800 +0100
+@@ -38,7 +38,7 @@
+ SUBDIRS = auxil scheme python pdb-templates macros compat utils protein_db mini-mol geometry \
+ lidia-core coot-utils angles ccp4mg-utils db-main analysis cootaneer ideal ligand coords \
+ density-contour skeleton high-res build MoleculesToTriangles pli \
+- python-tests cootilus goograph fonts pyrogen lbg data \
++ python-tests cootilus fonts pyrogen data \
+ man rama-data glTF pixmaps textures api
+ else
+ SUBDIRS = auxil scheme python pdb-templates macros compat utils protein_db mini-mol geometry \
--
GitLab