summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in4
-rw-r--r--aclocal.m4313
-rwxr-xr-xconfigure2
-rw-r--r--doc/Makefile.in2
-rw-r--r--doc/stamp-vti2
-rw-r--r--doc/version.texi2
-rw-r--r--guile-config/Makefile.in2
-rw-r--r--guile-readline/Makefile.in3
-rw-r--r--guile-readline/aclocal.m49
-rwxr-xr-xguile-readline/configure2
-rw-r--r--libguile/Makefile.in2
-rw-r--r--qt/Makefile.in2
-rw-r--r--qt/md/Makefile.in2
-rw-r--r--qt/time/Makefile.in2
14 files changed, 167 insertions, 182 deletions
diff --git a/Makefile.in b/Makefile.in
index 315f2c9c2..0b091cb66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
qtdmdb_s = @qtdmdb_s@
qthread_asflags = @qthread_asflags@
@@ -91,7 +91,7 @@ qtmd_h = @qtmd_h@
qtmdc_c = @qtmdc_c@
qtmds_s = @qtmds_s@
-SUBDIRS = ice-9 qt guile-readline libguile guile-config doc
+SUBDIRS = ice-9 qt libguile guile-config guile-readline doc
aclocaldir = $(datadir)/aclocal
aclocal_DATA = guile.m4 qthreads.m4
diff --git a/aclocal.m4 b/aclocal.m4
index 1928a827f..0baa1d958 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -154,6 +154,146 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
fi
])
+dnl QTHREADS_CONFIGURE configures the QuickThreads package. The QT
+dnl sources should be in $srcdir/qt. If configuration succeeds, this
+dnl macro creates the appropriate symlinks in the qt object directory,
+dnl and sets the following variables, used in building libqthreads.a:
+dnl QTHREAD_LTLIBS --- set to libqthreads.la if configuration
+dnl succeeds, or the empty string if configuration fails.
+dnl qtmd_h, qtmds_s, qtmdc_c, qtdmdb_s --- the names of the machine-
+dnl dependent source files.
+dnl qthread_asflags --- flags to pass to the compiler when processing
+dnl assembly-language files.
+dnl
+dnl It also sets the following variables, which describe how clients
+dnl can link against libqthreads.a:
+dnl THREAD_PACKAGE --- set to "QT" if configuration succeeds, or
+dnl the empty string if configuration fails.
+dnl THREAD_CPPFLAGS --- set to `-I' flags for thread header files
+dnl THREAD_LIBS_LOCAL --- linker options for use in this source tree
+dnl THREAD_LIBS_INSTALLED --- linker options for use after this package
+dnl is installed
+dnl It would be nice if all thread configuration packages for Guile
+dnl followed the same conventions.
+dnl
+dnl All of the above variables will be substituted into Makefiles in
+dnl the usual autoconf fashion.
+dnl
+dnl We distinguish between THREAD_LIBS_LOCAL and
+dnl THREAD_LIBS_INSTALLED because the thread library might be in
+dnl this tree, and be built using libtool. This means that:
+dnl 1) when building other executables in this tree, one must
+dnl pass the relative path to the ../libfoo.la file, but
+dnl 2) once the whole package has been installed, users should
+dnl link using -lfoo.
+dnl Normally, we only care about the first case, but since the
+dnl guile-config script needs to give users all the flags they need
+dnl to link programs against guile, the GUILE_WITH_THREADS macro
+dnl needs to supply the second piece of information as well.
+dnl
+dnl This whole thing is a little confused about what ought to be
+dnl done in the top-level configure script, and what ought to be
+dnl taken care of in the subdirectory. For example, qtmds_s and
+dnl friends really ought not to be even mentioned in the top-level
+dnl configure script, but here they are.
+
+AC_DEFUN([QTHREADS_CONFIGURE],[
+ AC_REQUIRE([AC_PROG_LN_S])
+
+ AC_MSG_CHECKING(QuickThreads configuration)
+ # How can we refer to the qt source directory from within the qt build
+ # directory? For headers, we can rely on the fact that the qt src
+ # directory appears in the #include path.
+ qtsrcdir="`(cd $srcdir; pwd)`/qt"
+
+ changequote(,)dnl We use [ and ] in a regexp in the case
+
+ THREAD_PACKAGE=QT
+ qthread_asflags=''
+ case "$host" in
+ i[3456]86-*-*)
+ port_name=i386
+ qtmd_h=md/i386.h
+ qtmds_s=md/i386.s
+ qtmdc_c=md/null.c
+ qtdmdb_s=
+ case "$host" in
+ *-*-netbsd* )
+ ## NetBSD needs to be told to pass the assembly code through
+ ## the C preprocessor. Other GCC installations seem to do
+ ## this by default, but NetBSD's doesn't. We could get the
+ ## same effect by giving the file a name ending with .S
+ ## instead of .s, but I don't see how to tell automake to do
+ ## that.
+ qthread_asflags='-x assembler-with-cpp'
+ ;;
+ esac
+ ;;
+ mips-sgi-irix[56]*)
+ port_name=irix
+ qtmd_h=md/mips.h
+ qtmds_s=md/mips-irix5.s
+ qtmdc_c=md/null.c
+ qtdmdb_s=md/mips_b.s
+ ;;
+ mips-*-*)
+ port_name=mips
+ qtmd_h=md/mips.h
+ qtmds_s=md/mips.s
+ qtmdc_c=md/null.c
+ qtdmdb_s=md/mips_b.s
+ ;;
+ sparc-*-sunos*)
+ port_name=sparc-sunos
+ qtmd_h=md/sparc.h
+ qtmds_s=md/_sparc.s
+ qtmdc_c=md/null.c
+ qtdmdb_s=md/_sparc_b.s
+ ;;
+ sparc-*-*)
+ port_name=sparc
+ qtmd_h=md/sparc.h
+ qtmds_s=md/sparc.s
+ qtmdc_c=md/null.c
+ qtdmdb_s=md/sparc_b.s
+ ;;
+ alpha-*-*)
+ port_name=alpha
+ qtmd_h=md/axp.h
+ qtmds_s=md/axp.s
+ qtmdc_c=md/null.c
+ qtdmdb_s=md/axp_b.s
+ ;;
+ *)
+ echo "Unknown configuration; threads package disabled"
+ THREAD_PACKAGE=""
+ ;;
+ esac
+ changequote([, ])
+
+ # Did configuration succeed?
+ if test -n "$THREAD_PACKAGE"; then
+ AC_MSG_RESULT($port_name)
+ QTHREAD_LTLIBS=libqthreads.la
+ THREAD_CPPFLAGS="-I$qtsrcdir -I../qt"
+ THREAD_LIBS_LOCAL="../qt/libqthreads.la"
+ THREAD_LIBS_INSTALLED="-lqthreads"
+ else
+ AC_MSG_RESULT(none; disabled)
+ fi
+
+ AC_SUBST(QTHREAD_LTLIBS)
+ AC_SUBST(qtmd_h)
+ AC_SUBST(qtmds_s)
+ AC_SUBST(qtmdc_c)
+ AC_SUBST(qtdmdb_s)
+ AC_SUBST(qthread_asflags)
+ AC_SUBST(THREAD_PACKAGE)
+ AC_SUBST(THREAD_CPPFLAGS)
+ AC_SUBST(THREAD_LIBS_LOCAL)
+ AC_SUBST(THREAD_LIBS_INSTALLED)
+])
+
# Do all the work for Automake. This macro actually does too much --
# some checks are only needed if your package does certain things.
# But this isn't really a big deal.
@@ -303,7 +443,7 @@ done<<>>dnl>>)
changequote([,]))])
-# serial 39 AC_PROG_LIBTOOL
+# serial 40 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
@@ -664,6 +804,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
@@ -687,9 +828,11 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
+ INCLTDL=
fi
])
@@ -702,8 +845,8 @@ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-dnl This is just to quiet aclocal about the macro not being used
-if(a,b,[AC_DISABLE_FAST_INSTALL])dnl
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
# serial 1
@@ -793,167 +936,3 @@ case "x$am_cv_prog_cc_stdc" in
esac
])
-dnl Autoconf macros for configuring the QuickThreads package
-dnl Jim Blandy <jimb@red-bean.com> --- July 1998
-dnl
-dnl Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GUILE.
-dnl
-dnl GUILE is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as
-dnl published by the Free Software Foundation; either version 2, or
-dnl (at your option) any later version.
-dnl
-dnl GUILE is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public
-dnl License along with GUILE; see the file COPYING. If not, write
-dnl to the Free Software Foundation, Inc., 59 Temple Place, Suite
-dnl 330, Boston, MA 02111-1307 USA
-
-
-
-dnl QTHREADS_CONFIGURE configures the QuickThreads package. The QT
-dnl sources should be in $srcdir/qt. If configuration succeeds, this
-dnl macro creates the appropriate symlinks in the qt object directory,
-dnl and sets the following variables, used in building libqthreads.a:
-dnl QTHREAD_LTLIBS --- set to libqthreads.la if configuration
-dnl succeeds, or the empty string if configuration fails.
-dnl qtmd_h, qtmds_s, qtmdc_c, qtdmdb_s --- the names of the machine-
-dnl dependent source files.
-dnl qthread_asflags --- flags to pass to the compiler when processing
-dnl assembly-language files.
-dnl
-dnl It also sets the following variables, which describe how clients
-dnl can link against libqthreads.a:
-dnl THREAD_PACKAGE --- set to "QT" if configuration succeeds, or
-dnl the empty string if configuration fails.
-dnl THREAD_CPPFLAGS --- set to `-I' flags for thread header files
-dnl THREAD_LIBS_LOCAL --- linker options for use in this source tree
-dnl THREAD_LIBS_INSTALLED --- linker options for use after this package
-dnl is installed
-dnl It would be nice if all thread configuration packages for Guile
-dnl followed the same conventions.
-dnl
-dnl All of the above variables will be substituted into Makefiles in
-dnl the usual autoconf fashion.
-dnl
-dnl We distinguish between THREAD_LIBS_LOCAL and
-dnl THREAD_LIBS_INSTALLED because the thread library might be in
-dnl this tree, and be built using libtool. This means that:
-dnl 1) when building other executables in this tree, one must
-dnl pass the relative path to the ../libfoo.la file, but
-dnl 2) once the whole package has been installed, users should
-dnl link using -lfoo.
-dnl Normally, we only care about the first case, but since the
-dnl guile-config script needs to give users all the flags they need
-dnl to link programs against guile, the GUILE_WITH_THREADS macro
-dnl needs to supply the second piece of information as well.
-dnl
-dnl This whole thing is a little confused about what ought to be
-dnl done in the top-level configure script, and what ought to be
-dnl taken care of in the subdirectory. For example, qtmds_s and
-dnl friends really ought not to be even mentioned in the top-level
-dnl configure script, but here they are.
-
-AC_DEFUN([QTHREADS_CONFIGURE],[
- AC_REQUIRE([AC_PROG_LN_S])
-
- AC_MSG_CHECKING(QuickThreads configuration)
- # How can we refer to the qt source directory from within the qt build
- # directory? For headers, we can rely on the fact that the qt src
- # directory appears in the #include path.
- qtsrcdir="`(cd $srcdir; pwd)`/qt"
-
- changequote(,)dnl We use [ and ] in a regexp in the case
-
- THREAD_PACKAGE=QT
- qthread_asflags=''
- case "$host" in
- i[3456]86-*-*)
- port_name=i386
- qtmd_h=md/i386.h
- qtmds_s=md/i386.s
- qtmdc_c=md/null.c
- qtdmdb_s=
- case "$host" in
- *-*-netbsd* )
- ## NetBSD needs to be told to pass the assembly code through
- ## the C preprocessor. Other GCC installations seem to do
- ## this by default, but NetBSD's doesn't. We could get the
- ## same effect by giving the file a name ending with .S
- ## instead of .s, but I don't see how to tell automake to do
- ## that.
- qthread_asflags='-x assembler-with-cpp'
- ;;
- esac
- ;;
- mips-sgi-irix[56]*)
- port_name=irix
- qtmd_h=md/mips.h
- qtmds_s=md/mips-irix5.s
- qtmdc_c=md/null.c
- qtdmdb_s=md/mips_b.s
- ;;
- mips-*-*)
- port_name=mips
- qtmd_h=md/mips.h
- qtmds_s=md/mips.s
- qtmdc_c=md/null.c
- qtdmdb_s=md/mips_b.s
- ;;
- sparc-*-sunos*)
- port_name=sparc-sunos
- qtmd_h=md/sparc.h
- qtmds_s=md/_sparc.s
- qtmdc_c=md/null.c
- qtdmdb_s=md/_sparc_b.s
- ;;
- sparc-*-*)
- port_name=sparc
- qtmd_h=md/sparc.h
- qtmds_s=md/sparc.s
- qtmdc_c=md/null.c
- qtdmdb_s=md/sparc_b.s
- ;;
- alpha*-*-*)
- port_name=alpha
- qtmd_h=md/axp.h
- qtmds_s=md/axp.s
- qtmdc_c=md/null.c
- qtdmdb_s=md/axp_b.s
- ;;
- *)
- echo "Unknown configuration; threads package disabled"
- THREAD_PACKAGE=""
- ;;
- esac
- changequote([, ])
-
- # Did configuration succeed?
- if test -n "$THREAD_PACKAGE"; then
- AC_MSG_RESULT($port_name)
- QTHREAD_LTLIBS=libqthreads.la
- THREAD_CPPFLAGS="-I$qtsrcdir -I../qt"
- THREAD_LIBS_LOCAL="../qt/libqthreads.la"
- THREAD_LIBS_INSTALLED="-lqthreads"
- else
- AC_MSG_RESULT(none; disabled)
- fi
-
- AC_SUBST(QTHREAD_LTLIBS)
- AC_SUBST(qtmd_h)
- AC_SUBST(qtmds_s)
- AC_SUBST(qtmdc_c)
- AC_SUBST(qtdmdb_s)
- AC_SUBST(qthread_asflags)
- AC_SUBST(THREAD_PACKAGE)
- AC_SUBST(THREAD_CPPFLAGS)
- AC_SUBST(THREAD_LIBS_LOCAL)
- AC_SUBST(THREAD_LIBS_INSTALLED)
-])
-
diff --git a/configure b/configure
index 9ec485ded..a58a0e02d 100755
--- a/configure
+++ b/configure
@@ -4597,7 +4597,7 @@ echo "configure:4545: checking QuickThreads configuration" >&5
qtmdc_c=md/null.c
qtdmdb_s=md/sparc_b.s
;;
- alpha*-*-*)
+ alpha-*-*)
port_name=alpha
qtmd_h=md/axp.h
qtmds_s=md/axp.s
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f420826d9..dccb151de 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
qtdmdb_s = @qtdmdb_s@
qthread_asflags = @qthread_asflags@
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 3deacae1d..013dddb07 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 7 July 1999
+@set UPDATED 8 July 1999
@set EDITION 1.3.1
@set VERSION 1.3.1
diff --git a/doc/version.texi b/doc/version.texi
index 3deacae1d..013dddb07 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 7 July 1999
+@set UPDATED 8 July 1999
@set EDITION 1.3.1
@set VERSION 1.3.1
diff --git a/guile-config/Makefile.in b/guile-config/Makefile.in
index d95c3dacf..a40bc3f3b 100644
--- a/guile-config/Makefile.in
+++ b/guile-config/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
qtdmdb_s = @qtdmdb_s@
qthread_asflags = @qthread_asflags@
diff --git a/guile-readline/Makefile.in b/guile-readline/Makefile.in
index f4577e121..c0e269c07 100644
--- a/guile-readline/Makefile.in
+++ b/guile-readline/Makefile.in
@@ -82,6 +82,8 @@ lib_LTLIBRARIES = libguilereadline.la
libguilereadline_la_SOURCES = readline.h readline.c
+BUILT_SOURCES = readline.x
+
scmdir = $(datadir)/guile
scm_DATA = readline-activator.scm
@@ -367,6 +369,7 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
diff --git a/guile-readline/aclocal.m4 b/guile-readline/aclocal.m4
index e93667054..3172a65b4 100644
--- a/guile-readline/aclocal.m4
+++ b/guile-readline/aclocal.m4
@@ -103,7 +103,7 @@ fi
AC_SUBST($1)])
-# serial 39 AC_PROG_LIBTOOL
+# serial 40 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
@@ -464,6 +464,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
@@ -487,9 +488,11 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+ INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
+ INCLTDL=
fi
])
@@ -502,6 +505,6 @@ AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-dnl This is just to quiet aclocal about the macro not being used
-if(a,b,[AC_DISABLE_FAST_INSTALL])dnl
+dnl This is just to silence aclocal about the macro not being used
+ifelse([AC_DISABLE_FAST_INSTALL])dnl
diff --git a/guile-readline/configure b/guile-readline/configure
index efe2ca952..278721f94 100755
--- a/guile-readline/configure
+++ b/guile-readline/configure
@@ -1545,7 +1545,7 @@ else
fi
if test $ac_cv_lib_readline_main = no; then
- { echo "configure: error: libreadline was not found on your system." 1>&2; exit 1; }
+ echo "configure: warning: libreadline was not found on your system." 1>&2
fi
for ac_func in rl_clear_signals rl_cleanup_after_signal
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 94fe0f3a4..9511b1538 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
qtdmdb_s = @qtdmdb_s@
qthread_asflags = @qthread_asflags@
diff --git a/qt/Makefile.in b/qt/Makefile.in
index bd95dadd3..df0e4acec 100644
--- a/qt/Makefile.in
+++ b/qt/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
qtdmdb_s = @qtdmdb_s@
qthread_asflags = @qthread_asflags@
diff --git a/qt/md/Makefile.in b/qt/md/Makefile.in
index 208f0cf23..dc08ee64f 100644
--- a/qt/md/Makefile.in
+++ b/qt/md/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
qtdmdb_s = @qtdmdb_s@
qthread_asflags = @qthread_asflags@
diff --git a/qt/time/Makefile.in b/qt/time/Makefile.in
index 66debdecb..d0bbdf1f8 100644
--- a/qt/time/Makefile.in
+++ b/qt/time/Makefile.in
@@ -76,6 +76,7 @@ LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
RANLIB = @RANLIB@
@@ -83,7 +84,6 @@ THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
THREAD_PACKAGE = @THREAD_PACKAGE@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
qtdmdb_s = @qtdmdb_s@
qthread_asflags = @qthread_asflags@