From 672afd5dad38431a55a14570632480f3ac94c7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 14 Sep 2006 03:05:35 +0000
Subject: Use pkg-config also to check for freetype2.

CVS patchset: 8251
CVS date: 2006/09/14 03:05:35
---
 m4/Makefile.am  |  1 -
 m4/freetype2.m4 | 34 ----------------------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 m4/freetype2.m4

(limited to 'm4')

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 656b59d12..2236e9bfc 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -17,7 +17,6 @@ EXTRA_DIST = glibc2.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-p
 	directx.m4 \
 	dl.m4 \
 	dvdnav.m4 \
-	freetype2.m4 \
 	gettext.m4 \
 	glibc21.m4 \
 	iconv.m4 \
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
deleted file mode 100644
index 5fc51bda9..000000000
--- a/m4/freetype2.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl
-dnl Search the freetype library.
-dnl
-dnl AM_PATH_FREETYPE2()
-dnl
-
-AC_DEFUN([AM_PATH_FREETYPE2], [
-
-  AC_ARG_ENABLE(freetype,
-    AC_HELP_STRING([--disable-freetype], [disable freetype2 support]),
-    [enable_freetype=$enableval],
-    [enable_freetype=yes]
-  )
-
-  if test x"$enable_freetype" = "xyes"; then
-    AC_PATH_TOOL(FREETYPE_CONFIG, freetype-config, no)
-    if test "$FREETYPE_CONFIG" = "no" ; then
-      AC_MSG_RESULT([*** freetype-config not found, freetype2 support disabled **
-  ])
-    else
-      FT2_CFLAGS=`$FREETYPE_CONFIG --cflags`
-      FT2_LIBS=`$FREETYPE_CONFIG --libs`
-      have_ft2="yes"
-      AC_DEFINE(HAVE_FT2,1,[Define this if you have freetype2 library])
-    fi
-  else
-    AC_MSG_RESULT([*** freetype2 support disabled ***])
-  fi
-
-  dnl AM_CONDITIONAL(HAVE_FT2, test x"$have_ft2" = "xyes" )
-  AC_SUBST(FT2_CFLAGS)
-  AC_SUBST(FT2_LIBS)
-
-])
-- 
cgit v1.2.3