1 --- TeXmacs-0.3.5.8-src/configure.in~ Sun Dec 2 11:57:09 2001
2 +++ TeXmacs-0.3.5.8-src/configure.in Sun Dec 2 11:57:09 2001
7 -AC_MSG_CHECKING(whether GNU C++ compiler is default)
21 AC_SUBST(CONFIG_WORD_MASK)
22 AC_SUBST(CONFIG_MAX_FAST)
24 -#--------------------------------------------------------------------
25 -# Default paths for installation
26 -#--------------------------------------------------------------------
28 -if test "$prefix" = ""; then
31 -if test "$prefix" = "NONE"; then
34 -if test "$exec_prefix" = ""; then
35 - exec_prefix=${prefix}
37 -if test "$exec_prefix" = "NONE"; then
38 - exec_prefix=${prefix}
40 -if test "$exec_prefix" = '${prefix}'; then
41 - exec_prefix=${prefix}
43 -if test "$includedir" = ""; then
44 - includedir=${exec_prefix}/include
46 -if test "$includedir" = "NONE"; then
47 - includedir=${exec_prefix}/include
49 -if test "$includedir" = '${exec_prefix}/include'; then
50 - includedir=${exec_prefix}/include
52 -if test "$libdir" = ""; then
53 - libdir=${exec_prefix}/lib
55 -if test "$libdir" = "NONE"; then
56 - libdir=${exec_prefix}/lib
58 -if test "$libdir" = '${exec_prefix}/lib'; then
59 - libdir=${exec_prefix}/lib
61 -if test "$bindir" = ""; then
62 - bindir=${exec_prefix}/bin
64 -if test "$bindir" = "NONE"; then
65 - bindir=${exec_prefix}/bin
67 -if test "$bindir" = '${exec_prefix}/bin'; then
68 - bindir=${exec_prefix}/bin
70 -if test "$datadir" = ""; then
71 - datadir=${prefix}/share
73 -if test "$datadir" = "NONE"; then
74 - datadir=${prefix}/share
76 -if test "$datadir" = '${prefix}/share'; then
77 - datadir=${prefix}/share
79 -if test "$mandir" = ""; then
80 - mandir=${prefix}/man
82 -if test "$mandir" = "NONE"; then
83 - mandir=${prefix}/man
85 -if test "$mandir" = '${prefix}/man'; then
86 - mandir=${prefix}/man
88 -if test "$libexecdir" = ""; then
89 - libexecdir=${exec_prefix}/libexec
91 -if test "$libexecdir" = "NONE"; then
92 - libexecdir=${exec_prefix}/libexec
94 -if test "$libexecdir" = '${exec_prefix}/libexec'; then
95 - libexecdir=${exec_prefix}/libexec
99 genccpath=${curdir}/gencc/bin
100 tmdir=${PACKAGE}-${VERSION}
101 diff -Nru TeXmacs-0.3.5.8-src/acinclude.m4 TeXmacs-0.3.5.8-src.new/acinclude.m4
102 --- TeXmacs-0.3.5.8-src/acinclude.m4 Thu Jan 1 01:00:00 1970
103 +++ TeXmacs-0.3.5.8-src.new/acinclude.m4 Mon Dec 3 19:41:15 2001
105 +#-------------------------------------------------------------------
106 +# Modify the X include files to make them C++-compatible, if needed
107 +#-------------------------------------------------------------------
109 +AC_DEFUN([CPP_X_HEADERS],[
110 +AC_MSG_CHECKING(for C++-compatible X header files)
111 +ac_save_cppflags="$CPPFLAGS"
112 +CPPFLAGS="$CPPFLAGS $X_CFLAGS"
113 +AC_TRY_COMPILE([#include <X11/Xlib.h>
114 +#include <X11/Xutil.h>],,
118 +if [ "x$x_includes" != xNONE ]
120 + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
121 + < "$x_includes/X11/Xlib.h" > X11/Xlib.h
122 + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
123 + < "$x_includes/X11/Xutil.h" > X11/Xutil.h
125 + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
126 + < /usr/include/X11/Xlib.h > X11/Xlib.h
127 + sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
128 + < /usr/include/X11/Xutil.h > X11/Xutil.h
130 +X_CFLAGS="-I.. $X_CFLAGS"
132 +CPPFLAGS="$ac_save_cppflags"
134 diff -Nru TeXmacs-0.3.5.8-src/aclocal.m4 TeXmacs-0.3.5.8-src.new/aclocal.m4
135 --- TeXmacs-0.3.5.8-src/aclocal.m4 Wed Nov 28 09:36:52 2001
136 +++ TeXmacs-0.3.5.8-src.new/aclocal.m4 Thu Jan 1 01:00:00 1970
139 -#-------------------------------------------------------------------
140 -# Modified version of GUILE_FLAGS in guile.m4
141 -# from the official guile distribution
142 -#-------------------------------------------------------------------
144 -AC_DEFUN([GUILE_FLAGS],[
145 -## The GUILE_FLAGS macro.
146 - ## First, let's just see if we can find Guile at all.
147 - AC_MSG_CHECKING(for Guile)
148 - guile-config link > /dev/null || {
149 - echo "configure: cannot find guile-config; is Guile installed?" 1>&2
152 - GUILE_ORIGINAL_CFLAGS="`guile-config compile`"
153 - GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
154 - GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
155 - GUILE_LDFLAGS="`guile-config link`"
156 - GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"
157 - AC_SUBST(GUILE_CFLAGS)
158 - AC_SUBST(GUILE_LDFLAGS)
163 -#-------------------------------------------------------------------
164 -# Modify the X include files to make them C++-compatible, if needed
165 -#-------------------------------------------------------------------
167 -AC_DEFUN(CPP_X_HEADERS,[
168 -AC_MSG_CHECKING(for C++-compatible X header files)
169 -ac_save_cppflags="$CPPFLAGS"
170 -CPPFLAGS="$CPPFLAGS $X_CFLAGS"
171 -AC_TRY_COMPILE([#include <X11/Xlib.h>
172 -#include <X11/Xutil.h>],,
176 -if [ "x$x_includes" != xNONE ]
178 - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
179 - < "$x_includes/X11/Xlib.h" > X11/Xlib.h
180 - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
181 - < "$x_includes/X11/Xutil.h" > X11/Xutil.h
183 - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
184 - < /usr/include/X11/Xlib.h > X11/Xlib.h
185 - sed 's/^extern \([[a-zA-Z0-9]]*(\)/extern int \1/' \
186 - < /usr/include/X11/Xutil.h > X11/Xutil.h
188 -X_CFLAGS="-I.. $X_CFLAGS"
190 -CPPFLAGS="$ac_save_cppflags"