Rene Rebe
21 years ago
9 changed files with 468 additions and 2 deletions
Split View
Diff Options
-
+50 -0package/rene/xemacs-beta/no-shared.patch
-
+17 -0package/rene/xemacs-beta/nostdlib.patch
-
+20 -0package/rene/xemacs-beta/only-versioned-bin.patch
-
+35 -0package/rene/xemacs-beta/ppc-oddity.patch
-
+35 -0package/rene/xemacs-beta/xemacs-beta.cache
-
+48 -0package/rene/xemacs-beta/xemacs-beta.conf
-
+54 -0package/rene/xemacs-beta/xemacs-beta.desc
-
+198 -0package/rene/xemacs-beta/xft-configure.patch
-
+11 -2package/rene/xemacs/xemacs.conf
@ -0,0 +1,50 @@ |
|||
# --- 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/no-shared.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 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} |
|||
@ -0,0 +1,17 @@ |
|||
|
|||
The usual linking hacks. |
|||
|
|||
- Rene Rebe <rene@rocklinux.org> |
|||
|
|||
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 |
|||
@ -0,0 +1,20 @@ |
|||
|
|||
We do not want this package to grab the xemacs binary - we use xemacs-beta |
|||
for this preview package. |
|||
|
|||
- Rene Rebe <rene@rocklinux.org> |
|||
|
|||
--- 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 \ |
|||
@ -0,0 +1,35 @@ |
|||
# --- 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/ppc-oddity.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 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 <rene@rocklinux.org> |
|||
|
|||
--- 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" |
|||
@ -0,0 +1,35 @@ |
|||
[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/xemacs.cache |
|||
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 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] 1073168980 Sat Jan 3 23:29:40 2004 |
|||
[CONFIG-ID] 2.0.0-rc5-x86-pentium-mmx-32-reference |
|||
[ROCKVER] 2.0.0-rc5 |
|||
|
|||
[LOGS] 5-xemacs.log 9-xemacs.log |
|||
|
|||
[BUILDTIME] 19257 (9) |
|||
[SIZE] 25.61 MB, 1375 files |
|||
|
|||
[DEP] bash bdb41 binutils bzip2 coreutils diffutils findutils gcc3 gdbm |
|||
[DEP] glibc23 gpm grep libelf libjpeg libpng libtiff linux24-header make |
|||
[DEP] ncurses net-tools openmotif patch sed sysfiles tar xfree86 zlib |
|||
|
|||
@ -0,0 +1,48 @@ |
|||
# --- 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/xemacs.conf |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 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,'" |
|||
|
|||
@ -0,0 +1,54 @@ |
|||
|
|||
[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/xemacs.desc |
|||
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 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" <stephen@xemacs.org> |
|||
[M] Rene Rebe <rene@rocklinux.org> |
|||
[M] Pjotr Prins <pjotr@rocklinux.org> |
|||
|
|||
[C] extra/editor extra/office |
|||
|
|||
[L] GPL |
|||
[S] Stable |
|||
[V] 21.5.17 |
|||
[P] X -----5---9 381.000 |
|||
|
|||
[D] 0 xemacs-21.5.17.tar.gz ftp://ftp.xemacs.org/xemacs-21.5/ |
|||
[D] 0 xft-xemacs-11222003.patch http://www-pu.informatik.uni-tuebingen.de/users/knauel/xemacs-xft/ |
|||
@ -0,0 +1,198 @@ |
|||
|
|||
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 <rene@rocklinux.org> |
|||
|
|||
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 <<EOF
|
|||
+#line 7438 "configure"
|
|||
+#include "confdefs.h"
|
|||
+/* Override any gcc2 internal prototype to avoid an error. */
|
|||
+/* We use char because int might match the return type of a gcc2
|
|||
+ builtin and then its argument prototype would still apply. */
|
|||
+char XRenderQueryExtension();
|
|||
+
|
|||
+int main() {
|
|||
+XRenderQueryExtension()
|
|||
+; return 0; }
|
|||
+EOF
|
|||
+if { (eval echo configure:7449: \"$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
|
|||
+ 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 <<EOF
|
|||
+#line 7479 "configure"
|
|||
+#include "confdefs.h"
|
|||
+/* Override any gcc2 internal prototype to avoid an error. */
|
|||
+/* We use char because int might match the return type of a gcc2
|
|||
+ builtin and then its argument prototype would still apply. */
|
|||
+char XftFontOpen();
|
|||
+
|
|||
+int main() {
|
|||
+XftFontOpen()
|
|||
+; return 0; }
|
|||
+EOF
|
|||
+if { (eval echo configure:7490: \"$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
|
|||
+ 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 <<EOF |
|||
-#line 7408 "configure"
|
|||
+#line 7535 "configure"
|
|||
#include "confdefs.h" |
|||
|
|||
int main() { |
|||
main() |
|||
; return 0; } |
|||
EOF |
|||
-if { (eval echo configure:7415: \"$ac_link\") 1>&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 |
|||
|
|||