[Pkg-jed-commit] [SCM] Debian packaging of JED branch, jo-upstream-fixes, updated. 9f0b76fa0fa7c5b1ea25350f4c285441efee9117

[Jörg Sommer]

The following commit has been merged in the jo-upstream-fixes branch:
commit 69969134e830053fcfd31e57710e997f7b668f40
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Fri May 30 00:24:17 2008 +0200

    Xft support for configure

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index c72badb..e4ecc63 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -69,6 +69,29 @@ AC_CHECK_LIB(slang, SLang_init_import, AC_DEFINE(JED_HAS_IMPORT, 1))
 dnl JD_FIND_SLANG
 JD_GCC_WARNINGS
 
+AC_ARG_ENABLE(xft,
+  AS_HELP_STRING([--disable-xft],
+     [disable X FreeType library support (antialiased fonts)]),
+  [enable_xft=$enableval], [enable_xft=default])
+
+if test X"$enable_xft" = Xno
+then
+  AC_MSG_NOTICE(checking for xft disabled)
+else
+  AC_CHECK_LIB(Xft, XftFontOpen,
+    [X_EXTRA_LIBS="$X_EXTRA_LIBS -lXft"
+     AC_DEFINE(XJED_HAS_XRENDERFONT, 1)
+     AC_PATH_PROG(PKGCONFIG, pkg-config)
+     if test -n "$PKGCONFIG"
+     then
+       X_CFLAGS="$X_CFLAGS $($PKGCONFIG --cflags xft)"
+     fi],
+    [if test X"$enable_xft" = Xyes
+     then
+       AC_MSG_FAILURE([libXft not found])
+     fi])
+fi
+
 dnl #------------------------------------------------------------------------
 dnl JD_CHECK_FOR_LIBRARY(pcre)
 dnl if test $jd_with_pcre_library = yes
diff --git a/src/Makefile.in b/src/Makefile.in
index 3a33488..0e529dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -60,11 +60,6 @@ OBJDIR = @OBJDIR@
 #GPMMOUSEO = gpmmouse.o
 #OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
 
- 
-# 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
-#    Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
-#XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
-
 #---------------------------------------------------------------------------
 # S-Lang library location
 #---------------------------------------------------------------------------
@@ -99,7 +94,7 @@ OTHERLIBS = @LIBS@
 MIN_SLANG_VERSION = 10311
 MAX_SLANG_VERSION =
 XLIB = $(X_XTRA_LIBS) $(XLIBDIR) -lX11 $(TERMCAP_LIB) $(OTHERLIBS)
-MISCLIBS = $(MOUSELIB) $(TERMCAP_LIB) $(X_XTRA_LIBS) $(OTHERLIBS)
+MISCLIBS = $(MOUSELIB) $(TERMCAP_LIB) $(OTHERLIBS)
 
 ALL_CFLAGS = $(CFLAGS) -Dunix -DJED $(MOUSEFLAGS) $(SLANG_INC)
 COMPILE_CMD = \
diff --git a/src/config.hin b/src/config.hin
index 9e39270..b1ad074 100644
--- a/src/config.hin
+++ b/src/config.hin
@@ -144,6 +144,9 @@
  */
 #undef JED_HAS_IMPORT
 
+/* For antialiased fonts, set this to 1 */
+#undef XJED_HAS_XRENDERFONT
+
 #ifndef JED
 # define JED
 #endif
diff --git a/src/jed-feat.h b/src/jed-feat.h
index 31db51f..3cf350b 100644
--- a/src/jed-feat.h
+++ b/src/jed-feat.h
@@ -78,9 +78,6 @@
  */
 #define XJED_SET_WM_COMMAND	0
 
-/* For antialiased fonts, set this to 1 and modify Makefile accordingly */
-#define XJED_HAS_XRENDERFONT	0
-  
 #if JED_HAS_EMACS_LOCKING && !defined(HAVE_SYMLINK)
 # undef JED_HAS_EMACS_LOCKING
 # define JED_HAS_EMACS_LOCKING 0

-- 
Debian packaging of JED