From c5c3ee51bdde63da7463d84f87e01990bcf6d529 Mon Sep 17 00:00:00 2001 From: David MacKenzie Date: Thu, 14 Nov 1996 00:42:10 +0000 Subject: [PATCH] fix AC_PATH_XTRA for solaris --- ChangeLog | 8 ++++++++ NEWS | 6 ------ TODO | 41 ---------------------------------------- acspecific.m4 | 40 +++++++++++++++++++++++++++------------ lib/autoconf/specific.m4 | 40 +++++++++++++++++++++++++++------------ 5 files changed, 64 insertions(+), 71 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2cbd5044..2556827e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ Wed Nov 13 10:07:14 1996 David J MacKenzie + * acspecific.m4 (AC_PROG_CC, AC_PROG_CXX): Check whether the + compiler works before checking whether it's a GNU compiler. + (AC_FUNC_VFORK): Call _exit after perror. + (AC_PATH_XTRA): Go back to using -R, as setting an env var as part + of CC doesn't get eval'd correctly to actually work. + Directly test whether a space is needed after -R. + Don't add "-L" to LDFLAGS if $x_libraries is empty. + * Test release 2.10.3. * testsuite/Makefile.in (dejacheck): New target, suggested by Tom diff --git a/NEWS b/NEWS index 63a3b6e5..0c74043c 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,3 @@ -Issues to resolve before release: - -Test the new features: AC_PROG_CC_WORKS on Solaris, AC_CACHE_SAVE -with spaces in var values on HP-UX, AC_FUNC_SETPGRP, AC_PATH_XTRA on -Solaris, sed command splitting on HP-UX (many AC_SUBST's), AC_FUNC_FNMATCH. - Major changes in release 2.11: * AC_PROG_CC and AC_PROG_CXX check whether the compiler works. diff --git a/TODO b/TODO index 16d4a0d3..aace4205 100644 --- a/TODO +++ b/TODO @@ -359,13 +359,6 @@ From: fjh@kryten.cs.mu.oz.au (Fergus Henderson) ------------------------------------------------------------------------------ -I think it would be useful to be able to have the variables expanded in -AC_CONFIG_HEADER just like AC_OUTPUT allows. - -From: Julian Onions - ------------------------------------------------------------------------------- - It would be nice if the configure script would handle an option such as --x-libraries="/usr/openwin/lib /usr/dt/lib". @@ -373,40 +366,6 @@ Rick Boykin ------------------------------------------------------------------------------ -This is fine, but painfully slow. - -Sun Jun 30 04:43:08 1996 Paul Eggert - - * acgeneral.m4 (AC_CACHE_SAVE): - Output each variable separately, so that values containing - special characters (e.g. ', \, newline) are handled correctly. - ---- acgeneral.m4 1996/11/09 22:20:01 1.211 -+++ acgeneral.m4 1996/11/12 04:32:06 -@@ -1051,10 +1052,16 @@ - dnl Allow a site initialization script to override cache values. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --# HP-UX 10.01 sh prints single quotes around any value that contains spaces. --(set) 2>&1 | --sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)='*\([^']*\)'*/\1=\${\1='\2'}/p"\ -- >> confcache -+ac_vars=`(set) 2>&1 | sed -n '/^[a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*=/s/=.*//p'` -+# Output each variable separately so that values containing -+# special characters (e.g. ', \, newline) are handled correctly. -+for ac_var in $ac_vars; do -+ eval ac_val=\$$ac_var -+ sed -e "s/'/'\\\\''/g" -e "1s/^/$ac_var=\${$ac_var='&/" -e "\$s/\$/'}/" \ -+ >> confcache < conftest.c < conftest.C </dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then - CC="LD_RUN_PATH=$x_libraries $CC" - fi + # others require no space. Words are not sufficient . . . . + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + AC_MSG_CHECKING(whether -R must be followed by a space) + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" + AC_TRY_LINK(, , ac_R_nospace=yes, ac_R_nospace=no) + if test $ac_R_nospace = yes; then + AC_MSG_RESULT(no) + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + AC_TRY_LINK(, , ac_R_space=yes, ac_R_space=no) + if test $ac_R_space = yes; then + AC_MSG_RESULT(yes) + X_LIBS="$X_LIBS -R $x_libraries" + else + AC_MSG_RESULT(neither works) + fi + fi + LIBS="$ac_xsave_LIBS" + esac fi # Check for system-dependent libraries X programs must link with. @@ -2028,7 +2044,7 @@ dnl FIXME banish uname from this macro! AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) if test $ac_cv_lib_dnet_dnet_ntoa = no; then AC_CHECK_LIB(dnet_stub, dnet_ntoa, - [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) + [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) fi # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -2070,7 +2086,7 @@ dnl FIXME banish uname from this macro! # Check for libraries that X11R6 Xt/Xaw programs need. ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$x_libraries" + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index fb95e46d..5e98312f 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -78,6 +78,7 @@ if test -z "$CC"; then test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) fi +AC_PROG_CC_WORKS AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc, [dnl The semicolon is to pacify NeXT's syntax-checking cpp. cat > conftest.c < conftest.C </dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then - CC="LD_RUN_PATH=$x_libraries $CC" - fi + # others require no space. Words are not sufficient . . . . + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + AC_MSG_CHECKING(whether -R must be followed by a space) + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" + AC_TRY_LINK(, , ac_R_nospace=yes, ac_R_nospace=no) + if test $ac_R_nospace = yes; then + AC_MSG_RESULT(no) + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + AC_TRY_LINK(, , ac_R_space=yes, ac_R_space=no) + if test $ac_R_space = yes; then + AC_MSG_RESULT(yes) + X_LIBS="$X_LIBS -R $x_libraries" + else + AC_MSG_RESULT(neither works) + fi + fi + LIBS="$ac_xsave_LIBS" + esac fi # Check for system-dependent libraries X programs must link with. @@ -2028,7 +2044,7 @@ dnl FIXME banish uname from this macro! AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) if test $ac_cv_lib_dnet_dnet_ntoa = no; then AC_CHECK_LIB(dnet_stub, dnet_ntoa, - [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) + [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) fi # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -2070,7 +2086,7 @@ dnl FIXME banish uname from this macro! # Check for libraries that X11R6 Xt/Xaw programs need. ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$x_libraries" + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE.