diff options
| author | Keith Packard <keithp@keithp.com> | 2010-06-03 07:01:26 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-03 07:01:26 -0700 |
| commit | b13d7a8e09c8e3eb5003420c3c0484431e5a052b (patch) | |
| tree | 0843c29134e2ebcc355682c3d0d04110191731ac | |
| parent | f0ab726d8966cab4e50154c216d577db79328d77 (diff) | |
| parent | dcceb90b1dccbbf5793f6ba1ed857013b71dafbc (diff) | |
Merge remote branch 'vignatti/for-keith'
| -rw-r--r-- | Xext/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 2 deletions
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) diff --git a/configure.ac b/configure.ac index 0541baca4..9e7d70085 100644 --- a/configure.ac +++ b/configure.ac @@ -1382,7 +1382,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 |