vte r2160 - trunk

[behdad svn gnome org]

Author: behdad
Date: Thu Nov 20 16:57:41 2008
New Revision: 2160
URL: http://svn.gnome.org/viewvc/vte?rev=2160&view=rev

Log:
2008-11-20  Behdad Esfahbod  <behdad gnome org>

        * configure.in:  Remove more cruft.



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Nov 20 16:57:41 2008
@@ -320,140 +320,11 @@
 fi
 
 
-################################################################################
-# Backends
-################################################################################
-
 # Search for the required modules.
 PKG_CHECK_MODULES(VTE,[$wantedmodules])
 NEEDEDPACKAGES="$wantedmodules"
 AC_SUBST(NEEDEDPACKAGES)
 
-# Check for various optional functions within those modules
-save_CFLAGS="$CFLAGS"
-save_LIBS="$LIBS"
-CFLAGS="$CFLAGS $VTE_CFLAGS"
-LIBS="$VTE_LIBS $LIBS"
-# Workaround a broken fontconfig-dev on Edgy
-AC_COMPILE_IFELSE([
-#include <fontconfig/fontconfig.h>
-int main(void)
-{
-	FcStrFree (FcNameUnparse (0));
-	return 0;
-}
-], [AC_CHECK_FUNCS([FcNameUnparse FcStrFree])],)
-LIBS="$save_LIBS"
-CFLAGS="$save_CFLAGS"
-
-# Require Freetype2. First see if there is suitable pkgconfig file...
-PKG_CHECK_EXISTS(freetype2 >= 6.1.0,
-		 [PKG_CHECK_MODULES(FT2, freetype2)], [
-	# We use our local copy of the macro because packages of
-	# freetype's development files don't always include the proper macro.
-	VTE_CHECK_FT2(6.1.0,,
-		      [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])])
-
-# Temporarily pull in the Freetype cflags and libs for checking what's
-# available in this version.
-savecflags="$CFLAGS"
-CFLAGS="$CFLAGS $FT2_CFLAGS"
-savecppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
-if test -d "$ac_x_includes" ; then
-	CFLAGS="$CFLAGS -I$ac_x_includes"
-	CPPFLAGS="$CPPFLAGS -I$ac_x_includes"
-fi
-AC_CHECK_HEADERS(ft2build.h)
-if test x$ac_cv_header_ft2build_h != xyes ; then
-	AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])
-fi
-
-AC_CHECK_DECL(ft_render_mode_mono,[AC_DEFINE(HAVE_DECL_ft_render_mode_mono,1,Define if your freetype2 installation defines ft_render_mode_mono.)],,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECL(FT_RENDER_MODE_MONO,[AC_DEFINE(HAVE_DECL_FT_RENDER_MODE_MONO,1,Define if your freetype2 installation defines FT_RENDER_MODE_MONO.)],,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECLS(FT_LOAD_NO_HINTING,,,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECLS(FT_RENDER_MODE_LIGHT,,,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECLS(FT_RENDER_MODE_NORMAL,,,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECL(FT_PIXEL_MODE_MONO,[AC_DEFINE(HAVE_DECL_FT_PIXEL_MODE_MONO,1,Define if your freetype2 build declares FT_PIXEL_MODE_MONO.)],,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-AC_CHECK_DECL(ft_pixel_mode_mono,[AC_DEFINE(HAVE_DECL_ft_pixel_mode_mono,1,Define if your freetype2 build declares ft_pixel_mode_mono.)],,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECLS(FT_PIXEL_MODE_GRAY2,,,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-AC_CHECK_DECLS(FT_PIXEL_MODE_GRAY4,,,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECL(FT_PIXEL_MODE_GRAY,[AC_DEFINE(HAVE_DECL_FT_PIXEL_MODE_GRAY,1,Define if your freetype2 build declares FT_PIXEL_MODE_GRAY.)],,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-AC_CHECK_DECL(ft_pixel_mode_grays,[AC_DEFINE(HAVE_DECL_ft_pixel_mode_grays,1,Define if your freetype2 build declares ft_pixel_mode_grays.)],,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-AC_CHECK_DECLS(FT_PIXEL_MODE_LCD,,,[
-#ifdef HAVE_FT2BUILD_H
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-])
-
-CFLAGS="$savecflags"
-CPPFLAGS="$savecppflags"
-
-
 wcs_funcs_includes="
 #ifdef HAVE_STRING_H
 # if !STDC_HEADERS && HAVE_MEMORY_H