[Gnash-commit] gnash/macros pango.m4

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/22 02:28:29

Modified files:
        macros         : pango.m4 

Log message:
        Use pangox on X11, pangowin32 on Win32.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- pango.m4    5 Mar 2008 03:55:56 -0000       1.29
+++ pango.m4    22 Mar 2008 02:28:29 -0000      1.30
@@ -30,9 +30,15 @@
     fi
   ])
 
+  if test x$windows = xyes; then
+    pango_pkg=pangowin32
+  else
+    pango_pkg=pangox
+  fi
+
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_incl}" = x; then
-      $PKG_CONFIG --exists pangox && ac_cv_path_pango_incl="`$PKG_CONFIG 
--cflags pangox`"
+      $PKG_CONFIG --exists $pango_pkg && ac_cv_path_pango_incl="`$PKG_CONFIG 
--cflags $pango_pkg`"
     fi
   fi
 
@@ -44,7 +50,7 @@
 
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x; then
-      $PKG_CONFIG --exists pangox && gnash_pango_version=`$PKG_CONFIG 
--modversion pangox | cut -d "." -f 1 | awk '{print $'0'".0"}'`
+      $PKG_CONFIG --exists $pango_pkg && gnash_pango_version=`$PKG_CONFIG 
--modversion $pango_pkg | cut -d "." -f 1 | awk '{print $'0'".0"}'`
     fi
   fi
 
@@ -89,7 +95,7 @@
   
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_pango_lib}" = x; then
-      $PKG_CONFIG --exists pangox && ac_cv_path_pango_lib=`$PKG_CONFIG 
--libs-only-l pangox`
+      $PKG_CONFIG --exists $pango_pkg && ac_cv_path_pango_lib=`$PKG_CONFIG 
--libs-only-l $pango_pkg`
     fi
   fi