--- gcl-2.6.7/elisp/makefile.deb 2003-09-08 23:47:43.000000000 +0200
+++ gcl-2.6.7/elisp/makefile 2007-02-18 13:28:18.000000000 +0100
@@ -7,11 +7,11 @@
cp *.el $(DESTDIR)$(EMACS_SITE_LISP)
if [ "$(EMACS_DEFAULT_EL)" != "" ] ; then \
if test -f "$(DESTDIR)${EMACS_DEFAULT_EL}" ; then \
- cat $(DESTDIR)${EMACS_DEFAULT_EL} | sed -e '/BEGIN gcl/,/END gcl/d' > $(DESTDIR)/temp_emacs_default ; \
+ cat $(DESTDIR)${EMACS_DEFAULT_EL} | sed -e '/BEGIN gcl/,/END gcl/d' > $(DESTDIR)$(EMACS_SITE_LISP)/temp_emacs_default ; \
mv $(DESTDIR)${EMACS_DEFAULT_EL} $(DESTDIR)${EMACS_DEFAULT_EL}.prev ; \
rm -f $(DESTDIR)${EMACS_DEFAULT_EL}c ; \
- cat add-default.el >> $(DESTDIR)/temp_emacs_default ; cp $(DESTDIR)/temp_emacs_default $(DESTDIR)${EMACS_DEFAULT_EL} ; \
- rm -f $(DESTDIR)/temp_emacs_default ; else \
+ cat add-default.el >> $(DESTDIR)$(EMACS_SITE_LISP)/temp_emacs_default ; cp $(DESTDIR)$(EMACS_SITE_LISP)/temp_emacs_default $(DESTDIR)${EMACS_DEFAULT_EL} ; \
+ rm -f $(DESTDIR)$(EMACS_SITE_LISP)/temp_emacs_default ; else \
cp add-default.el $(DESTDIR)${EMACS_DEFAULT_EL} ; fi ; \
chmod a+r $(DESTDIR)${EMACS_DEFAULT_EL} ; fi
--- gcl-2.6.7/info/makefile.deb 2004-06-26 00:40:25.000000000 +0200
+++ gcl-2.6.7/info/makefile 2007-02-18 13:28:19.000000000 +0100
@@ -58,13 +58,19 @@
# $(HTML_CMD) gcl.texi
gcl-si/index.html: ${GCL_SI} gcl-si.texi
- $(HTML_CMD) gcl-si.texi
+ mkdir -p $@
+ touch $@
+ -$(HTML_CMD) gcl-si.texi
gcl-tk/index.html: ${GCL_TK} gcl-tk.texi
- $(HTML_CMD) gcl-tk.texi
+ mkdir -p $@
+ touch $@
+ -$(HTML_CMD) gcl-tk.texi
gcl/index.html: gcl.texi
- $(HTML_CMD) gcl.texi
+ mkdir -p $@
+ touch $@
+ -$(HTML_CMD) gcl.texi
install-html: gcl-tk_toc.html gcl-si_toc.html gcl_toc.html
cp *.html /d/www/gcl
--- gcl-2.6.7/configure.in.deb 2005-01-15 20:17:17.000000000 +0100
+++ gcl-2.6.7/configure.in 2007-02-18 13:28:11.000000000 +0100
--- gcl-2.6.7/configure.in.deb 2005-01-15 20:17:17.000000000 +0100
+++ gcl-2.6.7/configure.in 2007-02-18 13:28:11.000000000 +0100
@@ -48,12 +48,12 @@
[TCL_CONFIG_PREFIX=$enableval],[TCL_CONFIG_PREFIX="unknown"])
AC_ARG_ENABLE(infodir,[ --enable-infodir=XXXX will force the use of a INFO_DIR=XXXXX as place to look for info ] ,
-[INFO_DIR=$enableval],[INFO_DIR="unknown"])
+[INFO_DIR=$enableval],[INFO_DIR=$prefix/share/info])
INFO_DIR=`eval echo $INFO_DIR/`
AC_ARG_ENABLE(emacsdir,[ --enable-emacsdir=XXXX will manually specify the location for elisp files ] ,
-[EMACS_SITE_LISP=$enableval],[EMACS_SITE_LISP="unknown"])
-EMACS_SITE_LISP=`eval echo $EMACS_SITE_LISP`
+[EMACS_SITE_LISP=$enableval],[EMACS_SITE_LISP=$prefix/share/emacs/site-lisp])
+EMACS_SITE_LISP=`eval echo $EMACS_SITE_LISP/`
AC_ARG_ENABLE(common-binary,[ --enable-common-binary=yes forces use of lowest common denominator instruction sets, (default is =yes)] ,
[use_common_binary=$enableval],[use_common_binary="yes"])
@@ -64,6 +64,9 @@
AC_ARG_ENABLE(xdr,[ --enable-xdr=yes will compile in support for XDR],
[try_xdr=$enableval],[try_xdr="no"])
+AC_ARG_ENABLE(xgcl,[ --enable-xgcl=yes will compile in support for XGCL],
+[enable_xgcl=$enableval],[enable_xgcl="yes"])
+
#
# Host information
#
@@ -288,6 +291,8 @@
def_statsysbfd="no" ; def_custreloc="yes" ;;
powerpc-macosx)
def_statsysbfd="no" ; def_locbfd="yes" ;;
+ *solaris*)
+ def_statsysbfd="no" ; def_locbfd="yes" ;;
esac
AC_ARG_ENABLE(dlopen,
@@ -379,7 +384,7 @@
#exit(1)
#fi
-AC_MSG_RESULT(use=$use)
+AC_MSG_RESULT([use=$use])
#
@@ -410,8 +415,11 @@
#fi
# subst GCC not only under 386-linux, but where available -- CM
-
-TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
+if test "$GCC" = "yes" ; then
+ TCFLAGS="-Wall -DVOL=volatile -fsigned-char"
+else
+ TCFLAGS="-DVOL=volatile -fsigned-char"
+fi
if test "$GCC" = "yes" ; then
TCFLAGS="$TCFLAGS -pipe"
case $use in
@@ -437,15 +445,23 @@
case "$use" in
*mingw*)
TFPFLAG="";;
+ m68k*)#FIXME gcc 4.x bug workaround
+ TFPFLAG="";;
*)
TFPFLAG="-fomit-frame-pointer";;
esac
-AC_CHECK_PROGS(AWK,gawk nawk awk,"")
+AC_CHECK_PROGS(AWK,[gawk nawk awk])
+
+# Work around system/gprof mips/hppa hang
+case $use in
+ mips*) enable_gprof="no";;
+ hppa*) enable_gprof="no";;
+esac
if test "$enable_gprof" = "yes" ; then
- TCFLAGS="$TCFLAGS -pg"
- TLIBS="$TLIBS -pg"
+ TCFLAGS="$TCFLAGS -pg";
+ TLIBS="$TLIBS -pg";
TFPFLAG=""
AC_DEFINE(GCL_GPROF)
AC_MSG_CHECKING(for text start)
@@ -496,14 +512,14 @@
if test "$enable_debug" != "yes" ; then TO2FLAGS="-O" ; fi
;;
arm*)
- TCFLAGS="$TCFLAGS -mlong-calls";;
+ TCFLAGS="$TCFLAGS -mlong-calls -fdollars-in-identifiers ";;
powerpc*)
if $CC -v 2>&1 | grep -q "gcc version 3.2" ; then
echo Reducing optimization for buggy gcc-3.2
if test "$enable_debug" != "yes" ; then TONIFLAGS="-O $TFPFLAG" ; fi
fi;
echo Probing for longcall
- if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[[1]]+0>=3 && A[[2]]+0>=3) exit 1;}'; then
+ if ! $CC -v 2>&1 | $AWK '/^gcc version / {split($3,A,".");if (A[[1]]+0>3 || (A[[1]]+0>=3 && A[[2]]+0>=3)) exit 1;}'; then
echo Enabling longcall on gcc 3.3 or later
TCFLAGS="$TCFLAGS -mlongcall"
echo Reducing optimization for buggy gcc 3.3 or later
@@ -538,7 +554,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
+ system="MP-RAS-`${AWK} '{print $3}' '/etc/.relid'`"
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
@@ -547,6 +563,12 @@
fi
fi
+if test "$use" = "powerpc-macosx" ; then
+ AC_CHECK_HEADER(malloc/malloc.h,[AC_DEFINE([HAVE_MALLOC_MALLOC_H])],
+ [AC_CHECK_HEADER(objc/malloc.h,[AC_DEFINE([HAVE_OBJC_MALLOC_H])],
+ [AC_MSG_ERROR([need malloc.h on macosx])])])
+fi
+
# sysconf
AC_CHECK_HEADER(unistd.h,
@@ -564,7 +586,7 @@
hz=`cat conftest1`
AC_DEFINE_UNQUOTED(HZ,$hz)
,hz=0,hz=0)
- AC_MSG_RESULT($hz)))
+ [AC_MSG_RESULT($hz)]))
#MY_SUBDIRS=
@@ -630,7 +652,7 @@
echo "#"
if test "$use_common_binary" = "yes"; then
- cd $GMPDIR && ./configure --host=$host && cd ..
+ cd $GMPDIR && ./configure --build=$host && cd ..
else
cd $GMPDIR && ./configure && cd ..
fi
@@ -654,11 +676,13 @@
AC_MSG_CHECKING("for leading underscore in object symbols")
cat>foo.c <<EOFF
#include <math.h>
-int main() {double d=0.0;cos(d);return 0;}
+#include <stdio.h>
+int main() {FILE *f;double d=0.0;getc(f);cos(d);return 0;}
EOFF
$CC -c foo.c -o foo.o
-if nm foo.o |grep " U " | grep "_cos" >/dev/null ; then
+if nm foo.o |grep " U " | grep "_cos" >/dev/null || nm foo.o |grep " U " | grep " _getc" >/dev/null ; then
LEADING_UNDERSCORE=1
+ AC_DEFINE(LEADING_UNDERSCORE)
AC_MSG_RESULT("yes")
else
LEADING_UNDERSCORE=""
@@ -1530,7 +1605,7 @@
AC_MSG_CHECKING([emacs site lisp directory])
if [[ "$EMACS_SITE_LISP" = "unknown" ]] ; then
if [[ "$EMACS" != "" ]] ; then
- EMACS_SITE_LISP=`$EMACS -q -batch --no-site-file -l conftest.el 2>&1 | sed -e /Loading/d | sed -e /load/d `
+ EMACS_SITE_LISP=`$EMACS -q -batch --no-site-file -l conftest.el 2>&1 | grep -v ^Warning: | sed -e /Loading/d | sed -e /load/d `
else
EMACS_SITE_LISP=""
fi
@@ -1586,12 +1661,7 @@
INFO_DIR=`$EMACS -q -batch --no-site-file -l conftest.el 2>&1 | sed -e /Loading/d | sed -e /load/d `
fi
fi
-if test -f "${INFO_DIR}dir" ; then true;else
-if test -f /usr/share/info/dir ; then
- INFO_DIR=/usr/share/info/
-else true;
-fi
-fi
+
AC_MSG_RESULT($INFO_DIR)
AC_SUBST(INFO_DIR)
@@ -1740,7 +1810,7 @@
AC_DEFINE(HAVE_ALLOCA)
else
AC_TRY_RUN([#include <alloca.h>
- int main() { exit(alloca(500) != NULL ? 0 : 1)}],
+ int main() { exit(alloca(500) != NULL ? 0 : 1);}],
,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
if test $gcl_ok = yes ; then
AC_MSG_RESULT(yes)
@@ -1797,9 +1867,9 @@
AC_MSG_RESULT([no])
fi
-LIBS="$LDFLAGS $TLDFLAGS $LIBS $TLIBS"
+LIBS="$LDFLAGS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $TLDFLAGS $LIBS $TLIBS"
AC_SUBST(LIBS)
-FINAL_CFLAGS="$CFLAGS $TCFLAGS $PROCESSOR_FLAGS"
+FINAL_CFLAGS="$CFLAGS $X_CFLAGS $TCFLAGS $PROCESSOR_FLAGS"
AC_SUBST(FINAL_CFLAGS)
# Work around bug with gcc on ppc -- CM
NIFLAGS="$CFLAGS $TCFLAGS $TONIFLAGS $PROCESSOR_FLAGS -I\$(GCLDIR)/o"
--- gcl-2.6.7/makedefc.in.deb 2004-03-10 23:51:36.000000000 +0100
+++ gcl-2.6.7/makedefc.in 2007-02-18 13:28:11.000000000 +0100
@@ -66,3 +66,4 @@
EXTRA_LOBJS=@EXTRA_LOBJS@
LEADING_UNDERSCORE=@LEADING_UNDERSCORE@
GNU_LD=@GNU_LD@
+AWK=@AWK@
