FLTK logo

[master] a355c16 - Fix 'configure --enable-pango'

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] a355c16 - Fix 'configure --enable-pango' "Albrecht Schlosser" Feb 16, 2021  
 
commit a355c16971907bdb02199a1eb6d04ffad82c115f
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Tue Feb 16 13:53:35 2021 +0100
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Tue Feb 16 13:53:35 2021 +0100

    Fix 'configure --enable-pango'
    
    Also change 'pango' to 'Pango' consistently in warning and error
    messages.

 configure.ac | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git configure.ac configure.ac
index f98a3b6..8dff5ff 100644
--- configure.ac
+++ configure.ac
@@ -1082,14 +1082,14 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
 	])
     ])
 
-    dnl test if pango is asked but xft was not found
+    dnl test if Pango is asked but xft was not found
     AS_IF([test x$enable_pango = xyes -a x$xft_found = xno], [
-        AC_MSG_WARN([could not find the Xft headers and/or libraries required for pango.])
+        AC_MSG_WARN([could not find the Xft headers and/or libraries required for Pango.])
         AC_MSG_NOTICE([please install Xft headers and libraries or don't use configure with '--enable-pango'.])
         AC_MSG_ERROR([Aborting.])
     ])
 
-    dnl Check for the pango library unless disabled...
+    dnl Check for the Pango library unless disabled...
     pango_found=no
     AS_IF([test x$enable_pango = xyes], [
 	AS_IF([test x$PKGCONFIG != x], [
@@ -1099,10 +1099,10 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
 	    LIBS="$($PKGCONFIG --libs pangocairo) $LIBS"
 
 	    AS_CASE([$host_os], [darwin*], [
-	        dnl make sure LDFLAGS is appropriate for cairo (and pango)
+	        dnl make sure LDFLAGS is appropriate for cairo (and Pango)
 	        LDFLAGS="$($PKGCONFIG --libs cairo) $LDFLAGS"
 	    ])
-        ], [
+
 	    AS_CASE([$host_os], [linux*], [
 	        CXXFLAGS="-I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include $CXXFLAGS"
 	        CXXFLAGS="-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include $CXXFLAGS"
@@ -1557,7 +1557,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
 	graphics="$graphics + Xrender"
     ])
     AS_IF([test x$pango_found = xyes], [
-	graphics="$graphics + pango"
+        graphics="$graphics + Pango"
     ])
 ])
 
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.