Re: GNOME CVS: pango tml

[jacob berkman <jacob ximian com>]

On Wed, 2001-10-03 at 02:18, Gnome CVS User wrote:
> 
> CVSROOT:	/cvs/gnome
> Module name:	pango
> Changes by:	tml	01/10/03 02:18:16
> 
> Modified files:
> 	.              : .cvsignore ChangeLog Makefile.am configure.in 
> 	modules/basic  : Makefile.am 
> 	pango          : Makefile.am pango-utils.c pangowin32-fontmap.c 
> 	                 pangowin32.c pangowin32.def pangowin32.h 
> Added files:
> 	.              : pangowin32-uninstalled.pc.in pangowin32.pc.in 
> 
> Log message:
> 2001-10-03  Tor Lillqvist  <tml iki fi>
> 
> Add the Win32 GDI Pango backend to autoconfiguration:
> 
> * configure.in: Call AC_LIBTOOL_WIN32_DLL. Check for native Win32
> or Cygwin, set automake conditional PLATFORM_WIN32. Check for
> native Win32, set OS_WIN32. Refactor the
> Xrender+Xft+Xft+FreeType.h checks not to use AC_CHECK_LIBs inside
> eachother, autoconf 2.52e on Cygwin generated bad shell code for
> that. Check for gdi32 library, set automake conditional
> HAVE_WIN32.

the first victim of the snapshot builds!

this commit breaks pango for me (red hat 7.1, autoconf 2.13-10).  i
suspect it is unhappy about the '@' in the function name, but i am too
tired to look into it more.

also the render tests were broken, an attached patch fixes that.

jacob
-- 

Index: configure.in
===================================================================
RCS file: /cvs/gnome/pango/configure.in,v
retrieving revision 1.78
diff -u -r1.78 configure.in
--- configure.in	2001/10/03 06:18:13	1.78
+++ configure.in	2001/10/04 05:11:44
@@ -122,6 +122,7 @@
 # Checks for Xft/XRender
 #
 have_xft=false
+have_lib_xrender=false
 XFT_LIBS=""
 XFT_CFLAGS=""
 if test $have_x = true ; then
@@ -129,9 +130,9 @@
     pango_save_cppflags="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
 
-    AC_CHECK_LIB(Xrender, XRenderFindFormat, have_lib_xrender = true, have_lib_xrender = false, -lXext $X_LIBS)
+    AC_CHECK_LIB(Xrender, XRenderFindFormat, have_lib_xrender=true, have_lib_xrender=false, -lXext $X_LIBS)
    if test $have_lib_xrender = true; then
-      AC_CHECK_LIB(Xft, XftFontOpen, have_lib_xft = true, have_lib_xft = false, -lXrender -lXext $X_LIBS $FREETYPE_LIBS)
+      AC_CHECK_LIB(Xft, XftFontOpen, have_lib_xft=true, have_lib_xft=false, -lXrender -lXext $X_LIBS $FREETYPE_LIBS)
       if test $have_lib_xft = true; then
 	AC_CHECK_HEADER(X11/Xft/XftFreetype.h, have_xft=true, :)
       fi
@@ -154,11 +155,6 @@
 have_win32=false
 WIN32_LIBS=""
 WIN32_CFLAGS=""
-AC_CHECK_LIB(gdi32, GetTextMetricsA 8, have_win32=true, : )
-
-if test $have_win32 = true; then
-  WIN32_LIBS="-lgdi32"
-fi
 
 AC_SUBST(WIN32_LIBS)
 AM_CONDITIONAL(HAVE_WIN32, $have_win32)