* configure.in: Ensure that -luser32 is always linked in for cygwin build.
* configure: Regenerated.
This commit is contained in:
Christopher Faylor
parent
a396d2bd0d
commit
040bbbc24b
3 changed files with 37 additions and 29 deletions
|
|
@ -1,3 +1,9 @@
|
|||
Mon Jan 18 12:51:44 1999 Christopher Faylor <cgf@cygnus.com>
|
||||
|
||||
* configure.in: Ensure that -luser32 is always linked in
|
||||
for cygwin build.
|
||||
* configure: Regenerated.
|
||||
|
||||
Mon Jan 18 08:38:05 1999 Mark Alexander <marka@cygnus.com>
|
||||
|
||||
* values.c (value_virtual_fn_field): Clear the pointed-to
|
||||
|
|
|
|||
55
gdb/configure
vendored
55
gdb/configure
vendored
|
|
@ -5182,8 +5182,9 @@ WINDRES=${WINDRES-windres}
|
|||
|
||||
|
||||
if test x$gdb_cv_os_cygwin = xyes; then
|
||||
WIN32LIBS="-luser32"
|
||||
if test x$enable_ide = xyes; then
|
||||
WIN32LIBS="-ladvapi32"
|
||||
WIN32LIBS="$WIN32LIBS -ladvapi32"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -5209,7 +5210,7 @@ if test "${with_tclconfig+set}" = set; then
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
|
||||
echo "configure:5213: checking for Tcl configuration" >&5
|
||||
echo "configure:5214: checking for Tcl configuration" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -5317,7 +5318,7 @@ if test "${with_tkconfig+set}" = set; then
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
|
||||
echo "configure:5321: checking for Tk configuration" >&5
|
||||
echo "configure:5322: checking for Tk configuration" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -5413,7 +5414,7 @@ fi
|
|||
|
||||
no_tcl=true
|
||||
echo $ac_n "checking for Tcl private headers. dir=${configdir}""... $ac_c" 1>&6
|
||||
echo "configure:5417: checking for Tcl private headers. dir=${configdir}" >&5
|
||||
echo "configure:5418: checking for Tcl private headers. dir=${configdir}" >&5
|
||||
# Check whether --with-tclinclude or --without-tclinclude was given.
|
||||
if test "${with_tclinclude+set}" = set; then
|
||||
withval="$with_tclinclude"
|
||||
|
|
@ -5479,17 +5480,17 @@ fi
|
|||
if test x"${ac_cv_c_tclh}" = x ; then
|
||||
ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
|
||||
echo "configure:5483: checking for tclInt.h" >&5
|
||||
echo "configure:5484: checking for tclInt.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5488 "configure"
|
||||
#line 5489 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tclInt.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:5493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:5494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -5549,7 +5550,7 @@ fi
|
|||
#
|
||||
no_tk=true
|
||||
echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6
|
||||
echo "configure:5553: checking for Tk private headers" >&5
|
||||
echo "configure:5554: checking for Tk private headers" >&5
|
||||
# Check whether --with-tkinclude or --without-tkinclude was given.
|
||||
if test "${with_tkinclude+set}" = set; then
|
||||
withval="$with_tkinclude"
|
||||
|
|
@ -5615,17 +5616,17 @@ fi
|
|||
if test x"${ac_cv_c_tkh}" = x ; then
|
||||
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tk.h""... $ac_c" 1>&6
|
||||
echo "configure:5619: checking for tk.h" >&5
|
||||
echo "configure:5620: checking for tk.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5624 "configure"
|
||||
#line 5625 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tk.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:5629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:5630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -5671,7 +5672,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for Itcl private headers. srcdir=${srcdir}""... $ac_c" 1>&6
|
||||
echo "configure:5675: checking for Itcl private headers. srcdir=${srcdir}" >&5
|
||||
echo "configure:5676: checking for Itcl private headers. srcdir=${srcdir}" >&5
|
||||
if test x"${ac_cv_c_itclh}" = x ; then
|
||||
for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do
|
||||
if test -f $i/src/itcl.h ; then
|
||||
|
|
@ -5694,7 +5695,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for Tix private headers. srcdir=${srcdir}""... $ac_c" 1>&6
|
||||
echo "configure:5698: checking for Tix private headers. srcdir=${srcdir}" >&5
|
||||
echo "configure:5699: checking for Tix private headers. srcdir=${srcdir}" >&5
|
||||
if test x"${ac_cv_c_tixh}" = x ; then
|
||||
for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do
|
||||
if test -f $i/generic/tix.h ; then
|
||||
|
|
@ -5766,7 +5767,7 @@ fi
|
|||
CONFIG_OBS="${CONFIG_OBS} gdbtk.o gdbtk-cmds.o gdbtk-hooks.o"
|
||||
|
||||
if test x$gdb_cv_os_cygwin = xyes; then
|
||||
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"
|
||||
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32"
|
||||
WIN32LDAPP="-Wl,--subsystem,console"
|
||||
CONFIG_OBS="${CONFIG_OBS} gdbres.o"
|
||||
fi
|
||||
|
|
@ -5788,7 +5789,7 @@ fi
|
|||
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
||||
# --without-x overrides everything else, but does not touch the cache.
|
||||
echo $ac_n "checking for X""... $ac_c" 1>&6
|
||||
echo "configure:5792: checking for X" >&5
|
||||
echo "configure:5793: checking for X" >&5
|
||||
|
||||
# Check whether --with-x or --without-x was given.
|
||||
if test "${with_x+set}" = set; then
|
||||
|
|
@ -5850,12 +5851,12 @@ if test "$ac_x_includes" = NO; then
|
|||
|
||||
# First, try using that file with no special directory specified.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5854 "configure"
|
||||
#line 5855 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$x_direct_test_include>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:5859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:5860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -5924,14 +5925,14 @@ if test "$ac_x_libraries" = NO; then
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$x_direct_test_library $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5928 "configure"
|
||||
#line 5929 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
# We can link X programs with no special library path.
|
||||
|
|
@ -6199,7 +6200,7 @@ links="${links} nm.h"
|
|||
fi
|
||||
# start-sanitize-gdbtk
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:6203: checking whether ln -s works" >&5
|
||||
echo "configure:6204: checking whether ln -s works" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -6234,19 +6235,19 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
||||
echo "configure:6238: checking for Cygwin environment" >&5
|
||||
echo "configure:6239: checking for Cygwin environment" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_cygwin'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6243 "configure"
|
||||
#line 6244 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return __CYGWIN32__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:6251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
am_cv_cygwin=yes
|
||||
else
|
||||
|
|
@ -6263,19 +6264,19 @@ echo "$ac_t""$am_cv_cygwin" 1>&6
|
|||
CYGWIN=
|
||||
test "$am_cv_cygwin" = yes && CYGWIN=yes
|
||||
echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6
|
||||
echo "configure:6267: checking for Mingw32 environment" >&5
|
||||
echo "configure:6268: checking for Mingw32 environment" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 6272 "configure"
|
||||
#line 6273 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return __MINGW32__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:6279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:6280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
am_cv_mingw32=yes
|
||||
else
|
||||
|
|
@ -6294,7 +6295,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes
|
|||
|
||||
|
||||
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
||||
echo "configure:6298: checking for executable suffix" >&5
|
||||
echo "configure:6299: checking for executable suffix" >&5
|
||||
if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
|
|||
|
|
@ -610,8 +610,9 @@ AC_SUBST(DLLTOOL)
|
|||
AC_SUBST(WINDRES)
|
||||
|
||||
if test x$gdb_cv_os_cygwin = xyes; then
|
||||
WIN32LIBS="-luser32"
|
||||
if test x$enable_ide = xyes; then
|
||||
WIN32LIBS="-ladvapi32"
|
||||
WIN32LIBS="$WIN32LIBS -ladvapi32"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -687,7 +688,7 @@ if test "${enable_gdbtk}" = "yes"; then
|
|||
CONFIG_OBS="${CONFIG_OBS} gdbtk.o gdbtk-cmds.o gdbtk-hooks.o"
|
||||
|
||||
if test x$gdb_cv_os_cygwin = xyes; then
|
||||
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32 -luser32"
|
||||
WIN32LIBS="${WIN32LIBS} -lshell32 -lgdi32 -lcomdlg32 -ladvapi32"
|
||||
WIN32LDAPP="-Wl,--subsystem,console"
|
||||
CONFIG_OBS="${CONFIG_OBS} gdbres.o"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue