diff options
| author | Jason Molenda <crash@cygnus> | 1995-10-25 01:33:26 +0000 |
|---|---|---|
| committer | Jason Molenda <crash@cygnus> | 1995-10-25 01:33:26 +0000 |
| commit | a2b63bbd6bea338402c419ddad28a782f4e180d1 (patch) | |
| tree | e87ba690d41d65f97b832f8b59fb257b94feebe6 /gdb/configure.in | |
| parent | 2a4e67c591fc208d4b9aa10596579f7e43036234 (diff) | |
| download | gdb-a2b63bbd6bea338402c419ddad28a782f4e180d1.zip gdb-a2b63bbd6bea338402c419ddad28a782f4e180d1.tar.gz gdb-a2b63bbd6bea338402c419ddad28a782f4e180d1.tar.bz2 | |
Tue Oct 24 18:30:18 1995 Jason Molenda (crash@phydeaux.cygnus.com)
* config/pa/hppahpux.mh: Remove hardcoding of X locations.
* Makefile.in: Use X11_CFLAGS, X11_LDFLAGS and X11_LIBS.
* configure.in: Link X statically on Solaris, SunOS and HPUX.
Diffstat (limited to 'gdb/configure.in')
| -rw-r--r-- | gdb/configure.in | 95 |
1 files changed, 68 insertions, 27 deletions
diff --git a/gdb/configure.in b/gdb/configure.in index bc3220a..fbe72df 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -51,35 +51,76 @@ no) enable_gdbtk=no ;; esac]) if test "${enable_gdbtk}" = "yes"; then - AC_PATH_X - AC_PATH_XTRA - - CYGNUS_PATH_TK - CYGNUS_PATH_TCL - - ENABLE_GDBTK=1 - - if test "x$x_includes" != "x" ; - then - X_INCDIR="-I$x_includes" - else - X_INCDIR="" - fi - - if test "x$x_libraries" != "x" ; - then - X_LIBDIR="-L$x_libraries" - else - X_LIBDIR="" - fi - - TCL_LIBS='$(TCL) $(TK) $(X11)' - ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS} -lm" - ENABLE_OBS="${ENABLE_OBS} gdbtk.o" + AC_PATH_X + AC_PATH_XTRA + + CYGNUS_PATH_TK + CYGNUS_PATH_TCL + + ENABLE_GDBTK=1 + + if test "x$no_x" != "xyes"; then + if test "x$x_includes" != "x" ; + then + X_CFLAGS="-I$x_includes" + else + X_CFLAGS="" + fi + + if test "x$x_libraries" != "x" ; + then + X_LDFLAGS="-L$x_libraries" + else + X_LDFLAGS="" + fi + + case "$host" in +# +# gdb linked statically w/ Solaris iff GCC is used, otherwise dynamic +# + sparc-sun-solaris2*) + if test "x$GCC" = "xyes"; + then + X_LIBS="-Wl,-Bstatic -lX11 -lXext -lX11 -Wl,-Bdynamic" + else + if test "x$x_libraries" != "x" ; + then + X_LDFLAGS="$X_LDFLAGS -R$x_libraries" + fi + X_LIBS="-lX11 -lXext -lX11" + fi ;; +# +# gdb linked statically w/ SunOS or HPUX +# + m68k-hp-hpux*|hppa*-hp-hpux*|sparc-sun-sunos*) + if test "x$x_libraries" != "x" ; + then + X_LIBS="$x_libraries/libX11.a" + else + X_LIBS="/usr/lib/libX11.a" + fi ;; +# +# default is to link dynamically +# + *) + X_LIBS="-lX11" ;; + esac + else + X_LDLAGS="" + X_CFLAGS="" + X_LIBS="" + AC_MSG_WARN([No X based programs will be built]) + fi + + TCL_LIBS='$(TCL) $(TK) $(X11_LDFLAGS) $(X11_LIBS)' + ENABLE_CLIBS="${ENABLE_CLIBS} ${TCL_LIBS} -lm" + ENABLE_OBS="${ENABLE_OBS} gdbtk.o" fi + AC_SUBST(ENABLE_GDBTK) -AC_SUBST(X_INCDIR) -AC_SUBST(X_LIBDIR) +AC_SUBST(X_CLFAGS) +AC_SUBST(X_LDFLAGS) +AC_SUBST(X_LIBS) # end-sanitize-gdbtk AC_SUBST(ENABLE_CFLAGS) |