From 733eaea0cc500fc7dcde08a7d8accf8b130dd33b Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 27 Jun 2005 13:45:58 +0000 Subject: [PATCH] Clifford Wolf: Removed empty package/rene Removed package/public/xemacs-beta git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6135 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/public/xemacs-beta/movemail.patch | 12 - package/public/xemacs-beta/no-shared.patch | 50 ---- package/public/xemacs-beta/nostdlib.patch | 36 --- .../xemacs-beta/only-versioned-bin.patch | 39 ---- package/public/xemacs-beta/ppc-oddity.patch | 35 --- package/public/xemacs-beta/xemacs-beta.cache | 44 ---- package/public/xemacs-beta/xemacs-beta.conf | 48 ---- package/public/xemacs-beta/xemacs-beta.desc | 54 ----- .../public/xemacs-beta/xft-configure.patch | 217 ------------------ 9 files changed, 535 deletions(-) delete mode 100644 package/public/xemacs-beta/movemail.patch delete mode 100644 package/public/xemacs-beta/no-shared.patch delete mode 100644 package/public/xemacs-beta/nostdlib.patch delete mode 100644 package/public/xemacs-beta/only-versioned-bin.patch delete mode 100644 package/public/xemacs-beta/ppc-oddity.patch delete mode 100644 package/public/xemacs-beta/xemacs-beta.cache delete mode 100644 package/public/xemacs-beta/xemacs-beta.conf delete mode 100644 package/public/xemacs-beta/xemacs-beta.desc delete mode 100644 package/public/xemacs-beta/xft-configure.patch diff --git a/package/public/xemacs-beta/movemail.patch b/package/public/xemacs-beta/movemail.patch deleted file mode 100644 index 502f7bc6a..000000000 --- a/package/public/xemacs-beta/movemail.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xemacs-21.5.17.orig/lib-src/movemail.c xemacs-21.5.17/lib-src/movemail.c ---- xemacs-21.5.17.orig/lib-src/movemail.c 2002-03-13 08:51:59.000000000 +0000 -+++ xemacs-21.5.17/lib-src/movemail.c 2005-02-09 09:37:39.000000000 +0000 -@@ -801,7 +801,7 @@ - mbx_delimit_begin (mbf); - if (pop_retr (server, i, mbx_write, mbf) != POP_RETRIEVED) - { -- error (Errmsg, NULL, NULL); -+ error ("%s", Errmsg, NULL, NULL); - close (mbfi); - return (1); - } diff --git a/package/public/xemacs-beta/no-shared.patch b/package/public/xemacs-beta/no-shared.patch deleted file mode 100644 index a6b886553..000000000 --- a/package/public/xemacs-beta/no-shared.patch +++ /dev/null @@ -1,50 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/xemacs-beta/no-shared.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -urN xemacs-21.4.12/Makefile.in.in xemacs-21.4.12-fixed/Makefile.in.in ---- xemacs-21.4.12/Makefile.in.in 2002-11-01 04:51:47.000000000 +0100 -+++ xemacs-21.4.12-fixed/Makefile.in.in 2003-03-29 02:07:21.000000000 +0100 -@@ -488,7 +488,7 @@ - done ; \ - fi - cd ${srcdir}/etc && \ -- for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ -+ for page in xemacs ; do \ - ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ - chmod 0644 ${mandir}/$${page}${manext} ; \ - done -diff -urN xemacs-21.4.12/lib-src/Makefile.in.in xemacs-21.4.12-fixed/lib-src/Makefile.in.in ---- xemacs-21.4.12/lib-src/Makefile.in.in 2002-08-20 13:34:16.000000000 +0200 -+++ xemacs-21.4.12-fixed/lib-src/Makefile.in.in 2003-03-29 02:00:12.000000000 +0100 -@@ -253,13 +253,8 @@ - fi - - install: ${archlibdir} -- @echo; echo "Installing utilities for users to run." -- for file in ${PUBLIC_INSTALLABLE_EXES} ; do \ -- (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ -- done -- for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \ -- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \ -- done -+ @echo; echo "Installing no utilities for users." -+ @echo; echo "They are shared with emacs and in a seperate ROCK package." - - uninstall: - cd ${bindir} && $(RM) ${PUBLIC_INSTALLABLES} diff --git a/package/public/xemacs-beta/nostdlib.patch b/package/public/xemacs-beta/nostdlib.patch deleted file mode 100644 index 191236d3c..000000000 --- a/package/public/xemacs-beta/nostdlib.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/xemacs-beta/nostdlib.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -The usual linking hacks. - - - Rene Rebe - -diff -ur xemacs-21.5.17/src/s/linux.h xemacs-21.5.17-xft/src/s/linux.h ---- xemacs-21.5.17/src/s/linux.h 2002-08-12 16:45:34.000000000 +0200 -+++ xemacs-21.5.17-xft/src/s/linux.h 2004-04-27 05:14:01.000000000 +0200 -@@ -116,7 +116,7 @@ - #else - #define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib/crtn.o" - #endif --#define LINKER "$(CC) -nostdlib" -+#define LINKER "$(CC)" - #endif - - #ifdef TERM diff --git a/package/public/xemacs-beta/only-versioned-bin.patch b/package/public/xemacs-beta/only-versioned-bin.patch deleted file mode 100644 index 6e4243b41..000000000 --- a/package/public/xemacs-beta/only-versioned-bin.patch +++ /dev/null @@ -1,39 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/xemacs-beta/only-versioned-bin.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -We do not want this package to grab the xemacs binary - we use xemacs-beta -for this preview package. - - - Rene Rebe - ---- xemacs-21.5.17/Makefile.in.in 2004-01-28 12:20:34.000000000 +0100 -+++ xemacs-21.5.17-xft/Makefile.in.in 2004-04-28 01:17:43.000000000 +0200 -@@ -395,9 +395,9 @@ - ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} - -chmod 0755 ${bindir}/${PROGNAME}-${version} - # ifdef CYGWIN -- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} -+ cd ${bindir} && $(RM) ./${PROGNAME}-beta && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}-beta - # else -- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} -+ cd ${bindir} && $(RM) ./${PROGNAME}-beta && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}-beta - # endif /* CYGWIN */ - #endif /* WIN32_NATIVE */ - if test "${prefix}" != "${exec_prefix}"; then \ diff --git a/package/public/xemacs-beta/ppc-oddity.patch b/package/public/xemacs-beta/ppc-oddity.patch deleted file mode 100644 index c1b8e2a59..000000000 --- a/package/public/xemacs-beta/ppc-oddity.patch +++ /dev/null @@ -1,35 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/xemacs-beta/ppc-oddity.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -To be able to build and run XEmacs on PowerPC we need to wipe some strange -outdated ... assumptions ... - - - Rene Rebe - ---- xemacs-21.4.13/configure.orig 2003-06-03 18:42:59.000000000 +0200 -+++ xemacs-21.4.13/configure 2003-06-03 18:43:06.000000000 +0200 -@@ -2974,8 +2974,6 @@ - fi - - --test "$machine$opsys" = "powerpclinux" && start_flags="-T $srcdir/src/ppc.ldscript" -- - if test "$unexec" = "unexaix.o"; then - if test "$dynamic" = "no"; then - start_flags="-Wl,-bnso,-bnodelcsect" diff --git a/package/public/xemacs-beta/xemacs-beta.cache b/package/public/xemacs-beta/xemacs-beta.cache deleted file mode 100644 index f48cea4ff..000000000 --- a/package/public/xemacs-beta/xemacs-beta.cache +++ /dev/null @@ -1,44 +0,0 @@ -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/rene/xemacs-beta/xemacs-beta.cache -[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[TIMESTAMP] 1119320491 Tue Jun 21 04:21:31 2005 (5) -[TIMESTAMP] 1119577416 Fri Jun 24 03:43:36 2005 (9) - -[CONFIG-ID] TRUNK-x86-reference-expert -[ROCKVER] TRUNK - -[LOGS] 5-xemacs-beta.log 9-xemacs-beta.log - -[BUILDTIME] 15406 (5) -[BUILDTIME] 15921 (9) -[SIZE] 38.32 MB, 1111 files - -[DEP] 00-dirtree bash2 binutils bzip2 coreutils diffutils expat findutils -[DEP] freetype freetype:dev gawk gcc34 gcc34:dev glibc23 glibc23:dev -[DEP] gpm gpm:dev grep libelf:dev libjpeg libjpeg:dev libpng libpng:dev -[DEP] libtiff libtiff:dev linux26-header:dev make mktemp nas nas:dev -[DEP] ncurses:dev net-tools openmotif openmotif:dev patch sed sysfiles -[DEP] tar xemacs xorg xorg:dev zlib:dev - -[PROVIDES] xemacs-21.5-b17 xemacs-21.5-b17-42bd11d7.dmp -[PROVIDES] xemacs-21.5-b17-42bf67bb.dmp xemacs-beta - diff --git a/package/public/xemacs-beta/xemacs-beta.conf b/package/public/xemacs-beta/xemacs-beta.conf deleted file mode 100644 index 0fd7ebbf6..000000000 --- a/package/public/xemacs-beta/xemacs-beta.conf +++ /dev/null @@ -1,48 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/xemacs-beta/xemacs-beta.conf -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -# the ./configure doesn't like the other ROCK default options ... -confopt="--prefix=$root/usr --with-msw=no --with-database=no --with-xft" -# --with-gtk --with-gnome" - -# oehm - the configure script is rather strange - we can not detect the options -# this is rather bruce force - do not do this in other *normal* packages ... -eval_config_command() -{ - config_command="$configprefix $configscript $confopt" - echo Running "$config_command" - eval "$config_command" -} - -# add the downloaded patches (normally only the Xft one) to the patchfile list -xemacs_beta_pc () -{ - # the xft patch does not apply for the ChangeLogs ... - for x in `echo $desc_D | sed 's/.* \(.*\.patch\) .*/\1/'` ; do - patch $patchopt < $archdir/$x || true # ;-) - done -} - -hook_add preconf 3 "xemacs_beta_pc" - -var_append INSTALL_WRAPPER_FILTER "|" "sed 's,man1/xemacs\.1$,man1/xemacs-beta.1,'" - diff --git a/package/public/xemacs-beta/xemacs-beta.desc b/package/public/xemacs-beta/xemacs-beta.desc deleted file mode 100644 index a0146583b..000000000 --- a/package/public/xemacs-beta/xemacs-beta.desc +++ /dev/null @@ -1,54 +0,0 @@ - -[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- -[COPY] -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] Please add additional copyright information _after_ the line containing -[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -[COPY] -[COPY] ROCK Linux: rock-src/package/rene/xemacs-beta/xemacs-beta.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; either version 2 of the License, or -[COPY] (at your option) any later version. A copy of the GNU General Public -[COPY] License can be found at Documentation/COPYING. -[COPY] -[COPY] Many people helped and are helping developing ROCK Linux. Please -[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM -[COPY] file for details. -[COPY] -[COPY] --- ROCK-COPYRIGHT-NOTE-END --- - -[I] X11 (beta) version of Emacs - -[T] XEmacs is a highly customizable open source text editor and application -[T] development system. It is protected under the GNU Public License and -[T] related to other versions of Emacs, in particular GNU Emacs. Its emphasis -[T] is on modern graphical user interface support and an open software -[T] development model, similar to Linux. XEmacs has an active development -[T] community numbering in the hundreds, and runs on Windows 95 and NT, Linux -[T] and nearly every other version of Unix in existence. Support for XEmacs -[T] has been supplied by Sun Microsystems, University of Illinois, Lucid, -[T] ETL/Electrotechnical Laboratory, Amdahl Corporation, BeOpen, and others, -[T] as well as the unpaid time of a great number of individual developers. -[T] -[T] This package includes the beta / testing version - currently including -[T] the Xft patch to render (vector) fonts anti-aliased. - -[U] http://www.xemacs.org - -[A] "Stephen J. Turnbull, XEmacs 21.4 Release Manager" -[M] The ROCK Linux Project -[M] Pjotr Prins - -[C] extra/editor extra/office - -[L] GPL -[S] Stable -[V] 21.5.17 -[P] X -?---5---9 178.500 - -[D] 3994434771 xemacs-21.5.17.tar.gz ftp://ftp.xemacs.org/xemacs-21.5/ -[D] 4233438749 xft-xemacs-11222003.patch http://www-pu.informatik.uni-tuebingen.de/users/knauel/xemacs-xft/ diff --git a/package/public/xemacs-beta/xft-configure.patch b/package/public/xemacs-beta/xft-configure.patch deleted file mode 100644 index 912d637dc..000000000 --- a/package/public/xemacs-beta/xft-configure.patch +++ /dev/null @@ -1,217 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/xemacs-beta/xft-configure.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -The pre-generated configure. Recent autoconf fail to generate it - so I used -and ancient system to do so. Clean up majorly since each line-number reference -changed and we do not want a multiple hundret kB diff ... - - - Rene Rebe - -diff -ur xemacs-21.5.17/configure xemacs-21.5.17-xft/configure ---- xemacs-21.5.17/configure 2004-03-22 09:50:04.000000000 +0100 -+++ xemacs-21.5.17-xft/configure 2004-04-27 05:03:40.000000000 +0200 -@@ -364,6 +364,7 @@ - with_hesiod | \ - with_dnet | \ - with_infodock | \ -+ with_xft | \ - with_netinstall | \ - with_ipv6_cname | \ - external_widget | \ -@@ -7393,25 +7387,156 @@ - fi - fi - -+ -+ if test "$with_xft" = "yes"; then -+ echo "checking xft-config program" 1>&6 -+echo "configure:7396: checking xft-config program" >&5 -+ # Extract the first word of "xft-config", so it can be a program name with args. -+set dummy xft-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:7400: checking for $ac_word" >&5 -+ -+if test -n "$XFT_CONFIG"; then -+ ac_cv_prog_XFT_CONFIG="$XFT_CONFIG" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_XFT_CONFIG=""yes"" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_XFT_CONFIG" && ac_cv_prog_XFT_CONFIG=""no"" -+fi -+XFT_CONFIG="$ac_cv_prog_XFT_CONFIG" -+if test -n "$XFT_CONFIG"; then -+ echo "$ac_t""$XFT_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ -+ if test "$XFT_CONFIG" = "yes"; then -+ echo "$ac_t""found" 1>&6 -+ libs_x="`xft-config --libs` $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`xft-config --libs`\" to \$libs_x"; fi -+ X_CFLAGS="`xft-config --cflags` $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`xft-config --cflags`\" to \$X_CFLAGS"; fi -+ else -+ echo "$ac_t""not found, checking for Xft 1.x" 1>&6 -+ -+echo $ac_n "checking for XRenderQueryExtension in -lXrender""... $ac_c" 1>&6 -+echo "configure:7433: checking for XRenderQueryExtension in -lXrender" >&5 -+ac_lib_var=`echo Xrender'_'XRenderQueryExtension | sed 'y%./+-%__p_%'` -+ -+xe_check_libs=" -lXrender " -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+xe_check_libs="" -+ -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then -+ echo "$ac_t""yes" 1>&6 -+ libs_x="-lXrender $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXrender\" to \$libs_x"; fi -+else -+ echo "$ac_t""no" 1>&6 -+(echo "$progname: Usage error:" -+echo " " "Unable to find libXrender for --with-xft" -+echo " Use \`$progname --help' to show usage.") >&2 && exit 1 -+fi -+ -+ -+ -+echo $ac_n "checking for XftFontOpen in -lXft""... $ac_c" 1>&6 -+echo "configure:7474: checking for XftFontOpen in -lXft" >&5 -+ac_lib_var=`echo Xft'_'XftFontOpen | sed 'y%./+-%__p_%'` -+ -+xe_check_libs=" -lXft " -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+xe_check_libs="" -+ -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then -+ echo "$ac_t""yes" 1>&6 -+ libs_x="-lXft $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXft\" to \$libs_x"; fi -+else -+ echo "$ac_t""no" 1>&6 -+(echo "$progname: Usage error:" -+echo " " "Unable to find libXft for --with-xft" -+echo " Use \`$progname --help' to show usage.") >&2 && exit 1 -+fi -+ -+ -+ fi -+ { test "$extra_verbose" = "yes" && cat << \EOF -+ Defining USE_XFT -+EOF -+cat >> confdefs.h <<\EOF -+#define USE_XFT 1 -+EOF -+} -+ -+ fi -+ - fi - if test "$with_msw" != "no"; then - echo "checking for MS-Windows" 1>&6 --echo "configure:7400: checking for MS-Windows" >&5 -+echo "configure:7527: checking for MS-Windows" >&5 - - echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 --echo "configure:7403: checking for main in -lgdi32" >&5 -+echo "configure:7530: checking for main in -lgdi32" >&5 - ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` - - xe_check_libs=" -lgdi32 " - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:7542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -16173,6 +16298,9 @@ - if test "$with_xauth" != yes; then - echo " - Xau (X authority) not available." - fi -+ if test "$with_xft" = "yes"; then -+ echo " Compiling in support for Xft antialiased fonts." -+ fi - if test "$with_xmu" != yes; then - echo " - Xmu library not available; substituting equivalent routines." - fi -@@ -16460,6 +16588,7 @@ - s%@X_PRE_LIBS@%$X_PRE_LIBS%g - s%@X_LIBS@%$X_LIBS%g - s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -+s%@XFT_CONFIG@%$XFT_CONFIG%g - s%@install_pp@%$install_pp%g - s%@libs_xauth@%$libs_xauth%g - s%@dnd_objs@%$dnd_objs%g -