The last three src subdirectories that still use the old
autoconf 2.19
are tk, tcl, and itcl. This patch is to update the autoconf
used by
those subdirectories. Since dejagnu is no longer in the src
tree I
believe that insight is the only user of these directories
and according
to MAINTAINERS is the group that needs to approve this patch
to use a
newer autoconf. I included gdb and binutils on the email to
give it
more visibility and sid because they do show a dependency on
tcl (in
CVSROOT/modules), though that may just be an old dejagnu
depenency.
The alpha versions of tk/tcl 8.5 use autoconf 2.59, as do
the latest
itcl sources so updating our version in advance of those
releases
shouldn't result in an long term ongoing maintanance issue.
I tested these changes on hppa1.1-hp-hpux11.11 by building
insight and
it built with no problems.
Ok for checkin?
Steve Ellcey
sje cup.hp.com
tk/ChangeLog
2006-06-16 Steve Ellcey <sjecup.hp.com>
* configure.in: Fix for autoconf 2.5.
* unix/tcl.m4: Fix for autoconf 2.5.
* configure: Regenerate.
* unix/configure: Regenerate.
* win/configure: Regenerate.
Index: tk/configure.in
============================================================
=======
RCS file: /cvs/src/src/tk/configure.in,v
retrieving revision 1.4
diff -c -r1.4 configure.in
*** tk/configure.in 21 Jan 2003 19:53:11 -0000 1.4
--- tk/configure.in 20 Jun 2006 16:44:05 -0000
***************
*** 13,28 ****
case "$" in
*cygwin* | *mingw32* | *windows32*)
CONFIGDIR="win"
! AC_SUBST(CONFIGDIR)
;;
*)
CONFIGDIR="unix"
! AC_SUBST(CONFIGDIR)
! AC_CONFIG_AUX_DIR($CONFIGDIR)
;;
esac
AC_PROG_MAKE_SET
- AC_CONFIG_SUBDIRS($CONFIGDIR)
AC_OUTPUT(Makefile)
--- 13,28 ----
case "$" in
*cygwin* | *mingw32* | *windows32*)
CONFIGDIR="win"
! AC_CONFIG_SUBDIRS("win")
;;
*)
CONFIGDIR="unix"
! AC_CONFIG_SUBDIRS("unix")
! AC_CONFIG_AUX_DIR("unix")
;;
esac
+ AC_SUBST(CONFIGDIR)
AC_PROG_MAKE_SET
AC_OUTPUT(Makefile)
Index: tk/unix/tcl.m4
============================================================
=======
RCS file: /cvs/src/src/tk/unix/tcl.m4,v
retrieving revision 1.7
diff -c -r1.7 tcl.m4
*** tk/unix/tcl.m4 8 Feb 2006 02:13:03 -0000 1.7
--- tk/unix/tcl.m4 20 Jun 2006 16:44:05 -0000
***************
*** 873,879 ****
# AIX v<=4.1 has some different flags than 4.2+
if test "$system" = "AIX-4.1"
-o "`uname -v`" -lt "4" ; then
! LIBOBJS="$LIBOBJS tclLoadAix.o"
DL_LIBS="-lld"
fi
--- 873,880 ----
# AIX v<=4.1 has some different flags than 4.2+
if test "$system" = "AIX-4.1"
-o "`uname -v`" -lt "4" ; then
! AC_LIBOBJ(tclLoadAix)
! USE_COMPAT=1
DL_LIBS="-lld"
fi
***************
*** 1112,1118 ****
# is kind of overkill but it works.
# Disable inlining only when one of the
# files in compat/*.c is being linked in.
! if test x"$" != x ; then
EXTRA_CFLAGS="$
-fno-inline"
fi
--- 1113,1119 ----
# is kind of overkill but it works.
# Disable inlining only when one of the
# files in compat/*.c is being linked in.
! if test x"$" != x ; then
EXTRA_CFLAGS="$
-fno-inline"
fi
***************
*** 2224,2230 ****
AC_MSG_RESULT(ok)
else
AC_MSG_RESULT(buggy)
! LIBOBJS="$LIBOBJS fixstrtod.o"
AC_DEFINE(strtod, fixstrtod)
fi
fi
--- 2225,2232 ----
AC_MSG_RESULT(ok)
else
AC_MSG_RESULT(buggy)
! AC_LIBOBJ(fixstrtod)
! USE_COMPAT=1
AC_DEFINE(strtod, fixstrtod)
fi
fi
tcl/ChangeLog
2006-06-16 Steve Ellcey <sjecup.hp.com>
* configure.in: Fix for autoconf 2.5.
* cygwin/configure.in: Fix for autoconf 2.5.
* win/configure.in: Fix for autoconf 2.5.
* unix/configure.in: Fix for autoconf 2.5.
* unix/tcl.m4: Fix for autoconf 2.5.
* configure: Regenerate.
* cygwin/configure: Regenerate.
* tools/configure: Regenerate.
* unix/configure: Regenerate.
* unix/dltest/configure: Regenerate.
* win/configure: Regenerate.
Index: tcl/configure.in
============================================================
=======
RCS file: /cvs/src/src/tcl/configure.in,v
retrieving revision 1.5
diff -c -r1.5 configure.in
*** tcl/configure.in 26 Nov 2002 19:47:47 -0000 1.5
--- tcl/configure.in 20 Jun 2006 16:44:09 -0000
***************
*** 11,33 ****
AC_CANONICAL_HOST
case "$" in
! *cygwin*)
! CONFIGDIR="win"
! AC_SUBST(CONFIGDIR)
! CONFIGDIR2="cygwin"
! AC_SUBST(CONFIGDIR2)
! ;;
! *mingw32* | *windows32*)
CONFIGDIR="win"
! AC_SUBST(CONFIGDIR)
;;
*)
CONFIGDIR="unix"
! AC_SUBST(CONFIGDIR)
! AC_CONFIG_AUX_DIR($CONFIGDIR)
;;
esac
AC_PROG_MAKE_SET
- AC_CONFIG_SUBDIRS($CONFIGDIR $CONFIGDIR2)
AC_OUTPUT(Makefile)
--- 11,34 ----
AC_CANONICAL_HOST
case "$" in
! *cygwin* | *mingw32* | *windows32*)
CONFIGDIR="win"
! AC_CONFIG_SUBDIRS("win")
;;
*)
CONFIGDIR="unix"
! AC_CONFIG_SUBDIRS("unix")
! AC_CONFIG_AUX_DIR("unix")
;;
esac
+ case "$" in
+ *cygwin*)
+ CONFIGDIR2="cygwin"
+ AC_SUBST(CONFIGDIR2)
+ AC_CONFIG_SUBDIRS("cygwin")
+ esac
+
+ AC_SUBST(CONFIGDIR)
AC_PROG_MAKE_SET
AC_OUTPUT(Makefile)
Index: tcl/cygwin/configure.in
============================================================
=======
RCS file: /cvs/src/src/tcl/cygwin/configure.in,v
retrieving revision 1.11
diff -c -r1.11 configure.in
*** tcl/cygwin/configure.in 6 Feb 2006 16:04:32 -0000 1.11
--- tcl/cygwin/configure.in 20 Jun 2006 16:44:09 -0000
***************
*** 22,29 ****
test -z "$CC" && AC_MSG_ERROR([no
acceptable cc found in \$PATH])
fi
- AC_PROG_CC_GNU
-
if test $ac_cv_prog_gcc = yes; then
GCC=yes
dnl Check whether -g works, even if CFLAGS is set, in case
the package
--- 22,27 ----
***************
*** 32,38 ****
ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
- AC_PROG_CC_G
if test "$ac_test_CFLAGS" = set; then
CFLAGS="$ac_save_CFLAGS"
elif test $ac_cv_prog_cc_g = yes; then
--- 30,35 ----
Index: tcl/win/configure.in
============================================================
=======
RCS file: /cvs/src/src/tcl/win/configure.in,v
retrieving revision 1.12
diff -c -r1.12 configure.in
*** tcl/win/configure.in 21 Jan 2003 19:40:21 -0000 1.12
--- tcl/win/configure.in 20 Jun 2006 16:44:09 -0000
***************
*** 313,319 ****
AC_SUBST(TCL_BUILD_EXP_FILE)
AC_SUBST(TCL_EXP_FILE)
AC_SUBST(DL_LIBS)
- AC_SUBST(LIBOBJS)
AC_SUBST(TCL_LIB_VERSIONS_OK)
AC_SUBST(TCL_PACKAGE_PATH)
--- 313,318 ----
Index: tcl/unix/configure.in
============================================================
=======
RCS file: /cvs/src/src/tcl/unix/configure.in,v
retrieving revision 1.9
diff -c -r1.9 configure.in
*** tcl/unix/configure.in 21 Jan 2003 19:40:19 -0000 1.9
--- tcl/unix/configure.in 20 Jun 2006 16:44:09 -0000
***************
*** 196,202 ****
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT([broken, using substitute])
! LIBOBJS="$LIBOBJS strstr.o"
fi
#-----------------------------------------------------------
---------
--- 196,203 ----
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT([broken, using substitute])
! AC_LIBOBJ(strstr)
! USE_COMPAT=1
fi
#-----------------------------------------------------------
---------
***************
*** 221,227 ****
}], , tcl_ok=0, tcl_ok=0)
if test "$tcl_ok" = 0; then
test -n "$verbose" && echo
" Adding strtoul.o."
! LIBOBJS="$LIBOBJS strtoul.o"
fi
#-----------------------------------------------------------
---------
--- 222,229 ----
}], , tcl_ok=0, tcl_ok=0)
if test "$tcl_ok" = 0; then
test -n "$verbose" && echo
" Adding strtoul.o."
! AC_LIBOBJ(strtoul)
! USE_COMPAT=1
fi
#-----------------------------------------------------------
---------
***************
*** 245,251 ****
}], , tcl_ok=0, tcl_ok=0)
if test "$tcl_ok" = 0; then
test -n "$verbose" && echo
" Adding strtod.o."
! LIBOBJS="$LIBOBJS strtod.o"
fi
#-----------------------------------------------------------
---------
--- 247,254 ----
}], , tcl_ok=0, tcl_ok=0)
if test "$tcl_ok" = 0; then
test -n "$verbose" && echo
" Adding strtod.o."
! AC_LIBOBJ(strtod)
! USE_COMPAT=1
fi
#-----------------------------------------------------------
---------
***************
*** 327,333 ****
AC_CHECK_LIB(inet, strncasecmp, tcl_ok=1, tcl_ok=0)
fi
if test "$tcl_ok" = 0; then
! LIBOBJS="$LIBOBJS strncasecmp.o"
fi
#-----------------------------------------------------------
---------
--- 330,337 ----
AC_CHECK_LIB(inet, strncasecmp, tcl_ok=1, tcl_ok=0)
fi
if test "$tcl_ok" = 0; then
! AC_LIBOBJ(strncasecmp)
! USE_COMPAT=1
fi
#-----------------------------------------------------------
---------
Index: tcl/unix/tcl.m4
============================================================
=======
RCS file: /cvs/src/src/tcl/unix/tcl.m4,v
retrieving revision 1.7
diff -c -r1.7 tcl.m4
*** tcl/unix/tcl.m4 8 Feb 2006 02:13:02 -0000 1.7
--- tcl/unix/tcl.m4 20 Jun 2006 16:44:09 -0000
***************
*** 878,884 ****
# AIX v<=4.1 has some different flags than 4.2+
if test "$system" = "AIX-4.1"
-o "`uname -v`" -lt "4" ; then
! LIBOBJS="$LIBOBJS tclLoadAix.o"
DL_LIBS="-lld"
fi
--- 878,885 ----
# AIX v<=4.1 has some different flags than 4.2+
if test "$system" = "AIX-4.1"
-o "`uname -v`" -lt "4" ; then
! AC_LIBOBJ(tclLoadAix)
! USE_COMPAT=1
DL_LIBS="-lld"
fi
***************
*** 1118,1124 ****
# is kind of overkill but it works.
# Disable inlining only when one of the
# files in compat/*.c is being linked in.
! if test x"$" != x ; then
EXTRA_CFLAGS="$
-fno-inline"
fi
--- 1119,1125 ----
# is kind of overkill but it works.
# Disable inlining only when one of the
# files in compat/*.c is being linked in.
! if test x"$" != x ; then
EXTRA_CFLAGS="$
-fno-inline"
fi
***************
*** 2230,2236 ****
AC_MSG_RESULT(ok)
else
AC_MSG_RESULT(buggy)
! LIBOBJS="$LIBOBJS fixstrtod.o"
AC_DEFINE(strtod, fixstrtod)
fi
fi
--- 2231,2238 ----
AC_MSG_RESULT(ok)
else
AC_MSG_RESULT(buggy)
! AC_LIBOBJ(fixstrtod)
! USE_COMPAT=1
AC_DEFINE(strtod, fixstrtod)
fi
fi
itcl/ChangeLog
2006-06-16 Steve Ellcey <sjecup.hp.com>
* configure.in: Fix for autoconf 2.5.
* aclocal.m4: Fix for autoconf 2.5.
* configure: Regenerate.
* itcl/configure: Regenerate.
* itcl/win/configure: Regenerate.
* itk/configure: Regenerate.
* itk/win/configure: Regenerate.
* iwidgets/configure: Regenerate.
Index: itcl/configure.in
============================================================
=======
RCS file: /cvs/src/src/itcl/configure.in,v
retrieving revision 1.6
diff -c -r1.6 configure.in
*** itcl/configure.in 21 Jan 2003 21:04:23 -0000 1.6
--- itcl/configure.in 20 Jun 2006 16:44:12 -0000
***************
*** 24,38 ****
AC_PREFIX_DEFAULT(/usr/local)
AC_PREFIX_PROGRAM(itclsh)
# Source-Navigator does not use the iwidgets packag
! subdirs=
!
! if test -d $/../snavigator && test ! -d
$/../gdb/gdbtk ; then
! subdirs="itcl itk"
! else
! subdirs="itcl itk iwidgets"
fi
- AC_CONFIG_SUBDIRS($subdirs)
AC_OUTPUT(Makefile,
chmod +x $/config/install-sh
$/config/mkinstalldirs)
--- 24,34 ----
AC_PREFIX_DEFAULT(/usr/local)
AC_PREFIX_PROGRAM(itclsh)
+ AC_CONFIG_SUBDIRS(itcl itk)
# Source-Navigator does not use the iwidgets packag
! if test ! -d $/../snavigator || test -d
$/../gdb/gdbtk ; then
! AC_CONFIG_SUBDIRS(iwidgets)
fi
AC_OUTPUT(Makefile,
chmod +x $/config/install-sh
$/config/mkinstalldirs)
Index: itcl/aclocal.m4
============================================================
=======
RCS file: /cvs/src/src/itcl/aclocal.m4,v
retrieving revision 1.3
diff -c -r1.3 aclocal.m4
*** itcl/aclocal.m4 21 Jan 2003 20:40:24 -0000 1.3
--- itcl/aclocal.m4 20 Jun 2006 16:44:12 -0000
***************
*** 478,524 ****
AC_SUBST(TK_BUILD_LIB_SPEC)
AC_SUBST(TK_LIB_SPEC)
])
-
- # Check to see if we're running under Win32, without
using
- # AC_CANONICAL_*. If so, set output variable EXEEXT to
".exe".
- # Otherwise set it to "".
-
- dnl AM_EXEEXT()
- dnl This knows we add .exe if we're building in the
Cygwin32
- dnl environment. But if we're not, then it compiles a
test program
- dnl to see if there is a suffix for executables.
- AC_DEFUN(AM_EXEEXT,
- [AC_REQUIRE([AM_CYGWIN32])
- AC_MSG_CHECKING([for executable suffix])
- AC_CACHE_VAL(am_cv_exeext,
- [if test "$CYGWIN32" = yes; then
- am_cv_exeext=.exe
- else
- cat > am_c_test.c << 'EOF'
- int main() {
- /* Nothing needed here */
- }
- EOF
- $ -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS
am_c_test.c $LIBS 1>&5
- am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed
-e s/am_c_test//`
- rm -f am_c_test*])
- test x"$" = x &&
am_cv_exeext=no
- fi
- EXEEXT=""
- test x"$" != xno &&
EXEEXT=$
- AC_MSG_RESULT($)
- AC_SUBST(EXEEXT)])
-
- # Check to see if we're running under Cygwin32, without
using
- # AC_CANONICAL_*. If so, set output variable CYGWIN32 to
"yes".
- # Otherwise set it to "no".
-
- dnl AM_CYGWIN32()
- AC_DEFUN(AM_CYGWIN32,
- [AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32,
- [AC_TRY_COMPILE(,[int main () { return __CYGWIN32__; }],
- am_cv_cygwin32=yes, am_cv_cygwin32=no)
- rm -f conftest*])
- CYGWIN32=
- test "$am_cv_cygwin32" = yes &&
CYGWIN32=yes])
-
--- 478,480 ----
|