From c043de3261b6e14f2446b2cd9d62dde5860d4720 Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Mon, 3 May 2010 12:37:25 +0200 Subject: [PATCH 1/2] configure: sha1: check libsha1 using pkg-config instead Previously the code was using AC_CHECK_LIB, guaranteeing whether the library is correct by tracking sha1_begin function. This paranoic checking is not necessary given there's only one libsha1 in the market, which surely contains such function. Moreover, this patch now improves a bit the sha1 implementation checking behavior using pkg-config to find the right flags that needs to link against. Signed-off-by: Tiago Vignatti Reviewed-by: Mikhail Gusarov --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b5b638af6..8976319ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1380,7 +1380,7 @@ if test "x$with_sha1" = xlibmd; then [Use libmd SHA1 functions]) SHA1_LIBS=-lmd fi -AC_CHECK_LIB([sha1], [sha1_begin], [HAVE_LIBSHA1=yes]) +PKG_CHECK_MODULES([LIBSHA1], [sha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no]) if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then with_sha1=libsha1 fi From dcceb90b1dccbbf5793f6ba1ed857013b71dafbc Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Wed, 19 May 2010 11:45:46 +0200 Subject: [PATCH 2/2] xext: delete wrong source reference from fontcache This should go away in 0b45ba48. Signed-off-by: Tiago Vignatti Reviewed-by: Mikhail Gusarov --- Xext/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Xext/Makefile.am b/Xext/Makefile.am index fa007aa91..e444fd08f 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -133,7 +133,6 @@ EXTRA_DIST = \ $(XSELINUX_SRCS) \ $(XCALIBRATE_SRCS) \ $(XINERAMA_SRCS) \ - $(FONTCACHE_SRCS) \ $(BIGFONT_SRCS) \ $(DPMS_SRCS) \ $(GE_SRCS)