# HG changeset patch
# User michaels
# Date 1135271407 0
# Node ID a61bf7b32988590d447c9af79ebeb8e3df752554
# Parent  44a63e4a23cdd58bf75d7c424ef9d3bb6dfc8537
[xemacs-hg @ 2005-12-22 17:10:07 by michaels]
2005-12-13 Mike Sperber <mike@xemacs.org>

	* configure.ac: Move the checks for the Xft-associated
	library out of a conditional.

diff -r 44a63e4a23cd -r a61bf7b32988 ChangeLog
--- a/ChangeLog	Thu Dec 22 13:58:16 2005 +0000
+++ b/ChangeLog	Thu Dec 22 17:10:07 2005 +0000
@@ -1,3 +1,8 @@
+2005-12-13 Mike Sperber <mike@xemacs.org>
+
+	* configure.ac: Move the checks for the Xft-associated
+	library out of a conditional.
+
 2005-12-18  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.24 "dandelion" is released.
diff -r 44a63e4a23cd -r a61bf7b32988 configure.ac
--- a/configure.ac	Thu Dec 22 13:58:16 2005 +0000
+++ b/configure.ac	Thu Dec 22 17:10:07 2005 +0000
@@ -3437,22 +3437,21 @@
 			   [xft_includes_found=yes],
 			   [c_switch_site=$save_c_switch_site])
 	fi
-      done
-      if test "$xft_includes_found" != "yes"; then
-        XE_DIE(["Unable to find headers for --with-xft"])
-      else
-        AC_CHECK_LIB(Xrender, XRenderQueryExtension, XE_PREPEND(-lXrender, libs_x),
-	    [XE_DIE(["Unable to find libXrender for --with-xft"])])
-        AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x),
-	    [XE_DIE(["Unable to find libfontconfig for --with-xft"])])
-        AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x),
-	    [XE_DIE(["Unable to find libXft for --with-xft"])])
-        AC_DEFINE(USE_XFT)
-        dnl Due to interactions with other libraries, must postpone AC_DEFINE
-        dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
-	unset xft_includes_found
-      fi
-])
+      done])
+    if test "$xft_includes_found" != "yes"; then
+      XE_DIE(["Unable to find headers for --with-xft"])
+    else
+      AC_CHECK_LIB(Xrender, XRenderQueryExtension, XE_PREPEND(-lXrender, libs_x),
+          [XE_DIE(["Unable to find libXrender for --with-xft"])])
+      AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x),
+          [XE_DIE(["Unable to find libfontconfig for --with-xft"])])
+      AC_CHECK_LIB(Xft, XftFontOpen, XE_PREPEND(-lXft, libs_x),
+          [XE_DIE(["Unable to find libXft for --with-xft"])])
+      AC_DEFINE(USE_XFT)
+      dnl Due to interactions with other libraries, must postpone AC_DEFINE
+      dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGE.
+      unset xft_includes_found
+    fi
   fi
 
 fi dnl $with_x11 = yes