? libXfont-1.1.0.tar.bz2
? libXfont-1.1.0.tar.gz
Index: configure.ac
===================================================================
RCS file: /cvs/xorg/lib/Xfont/configure.ac,v
retrieving revision 1.23
diff -u -3 -p -u -r1.23 configure.ac
--- configure.ac	1 Apr 2006 23:05:40 -0000	1.23
+++ configure.ac	20 Jun 2006 13:30:46 -0000
@@ -187,9 +187,18 @@ fi
 
 AM_CONDITIONAL(XFONT_FONTFILE, [test "x$XFONT_FONTFILE" = xyes])
 if test "x$XFONT_FONTFILE" = xyes; then
-	AC_DEFINE(XFONT_FONTFILE,,[Support fonts in files])
+	AC_DEFINE(XFONT_FONTFILE,1,[Support fonts in files])
 fi
 
+AC_CACHE_CHECK([whether to use stubs],ac_cv_use_stubs,[
+
+case $host_os in
+	darwin*)ac_cv_use_stubs=no;;
+	*) ac_cv_use_stubs=yes;;
+esac
+])
+
+AM_CONDITIONAL(USE_STUBS, [test x$ac_cv_use_stubs = xyes])
 #
 # Font cache extension support?
 #
Index: src/Makefile.am
===================================================================
RCS file: /cvs/xorg/lib/Xfont/src/Makefile.am,v
retrieving revision 1.5
diff -u -3 -p -u -r1.5 Makefile.am
--- src/Makefile.am	20 Mar 2006 19:44:26 -0000	1.5
+++ src/Makefile.am	20 Jun 2006 13:30:46 -0000
@@ -66,8 +66,11 @@ endif
 UTIL_DIR = util
 UTIL_LIB = util/libutil.la
 
+if USE_STUBS 
 STUBS_LIB = stubs/libstubs.la
 STUBS_DIR = stubs
+NOUNDEFINED = -no-undefined
+endif
 
 SUBDIRS=\
 	$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \
@@ -82,4 +85,4 @@ libXfont_la_LIBADD = \
 
 libXfont_la_SOURCES = dummy.c
 
-libXfont_la_LDFLAGS = -version-number 1:4:1 -no-undefined
+libXfont_la_LDFLAGS = -version-number 1:4:1 $(NOUNDEFINED)