diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | aclocal.m4 | 74 | ||||
| -rw-r--r-- | configure.in | 4 |
5 files changed, 87 insertions, 5 deletions
@@ -1,13 +1,20 @@ +Fri May 23 10:06:34 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * configure.in: Use AC_PROG_CC_LOCAL instead of AC_PROG_CC. + * aclocal.m4: New file. + * Makefile (DIST_FILES): Add aclocal.m4. + (Patch from Marcus G. Daniels, marcus@cathcart.sysc.pdx.edu). + Wed May 7 12:28:58 1997 Miles Bader <miles@gnu.ai.mit.edu> - (libftpconn, ftpfs): New directories. + * libftpconn, ftpfs: New directories. * Makefile (lib-subdirs): Add libftpconn. (prog-subdirs): Add ftpfs. Mon Mar 10 17:07:11 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makefile (prog-subdirs): Add `serverboot'. - (serverboot): New directory. + * serverboot: New directory. Fri Oct 25 20:17:47 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> @@ -25,7 +25,7 @@ endif include $(srcdir)/Makeconf DIST_FILES = COPYING Makeconf config.make.in configure.in configure \ - hurd.boot build.mk.in build.mkcf.in SETUP \ + hurd.boot build.mk.in build.mkcf.in SETUP aclocal.m4 \ README NEWS tasks INSTALL INSTALL-cross version.h sh-version.sed @@ -28,6 +28,7 @@ See `tasks', the exported task list. * Write coding standards suggestions for Hurd * Implement file_fetch_dir * Conform to coding standards (esp. CFLAGS setting) +* Internationalization ! * Fix emacs/src/unexelf.c to deal with occasional lack of mmap ! diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 00000000..e5abbb33 --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,74 @@ +dnl These modifications are to allow for an empty cross compiler tree. +dnl In the situation that cross-linking is impossible, the variable +dnl `cross_linkable' will be substituted with "yes". + +dnl +AC_DEFUN(AC_PROG_CC_LOCAL, +[AC_BEFORE([$0], [AC_PROG_CPP])dnl +AC_CHECK_PROG(CC, gcc, gcc) +if test -z "$CC"; then + AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) + test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) +fi + +AC_PROG_CC_WORKS_LOCAL +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 +dnl plays around with CFLAGS (such as to build both debugging and +dnl normal versions of a library), tasteless as that idea is. + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= +dnl AC_PROG_CC_G + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +dnl # This doesn't work on Linux (libc-4.5.26): Because of differences between +dnl # the shared and the static libraries there are less symbols available +dnl # without -g than with -g. It is therefore better to run the configuration +dnl # without -g and to add -g afterwards than the contrary. So don't add +dnl # -g to the CFLAGS now. +dnl elif test $ac_cv_prog_cc_g = yes; then +dnl CFLAGS="-g -O" + else +dnl CFLAGS="-O" + # Add "-O" to both the CC and CPP commands, to eliminate possible confusion + # that results from __OPTIMIZE__ being defined for CC but not CPP. +changequote(, )dnl + if echo "$CC " | grep ' -O[1-9 ]' > /dev/null 2>&1; then +changequote([, ])dnl + : # already optimizing + else + CC="$CC -O" + ac_cv_prog_CC="$CC" + fi + fi +else + GCC= +dnl # See above. +dnl test "${CFLAGS+set}" = set || CFLAGS="-g" +fi +]) + +AC_DEFUN(AC_PROG_CC_WORKS_LOCAL, +[AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works]) +AC_LANG_SAVE +AC_LANG_C +AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross) +AC_LANG_RESTORE +AC_MSG_RESULT($ac_cv_prog_cc_works) +if test $ac_cv_prog_cc_works = no; then + cross_linkable=no + ac_cv_prog_cc_cross=yes + # AC_MSG_ERROR([installation or configuration problem: C compiler cannot create executables.]) +else + cross_linkable=yes +fi +AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler]) +AC_MSG_RESULT($ac_cv_prog_cc_cross) +AC_SUBST(cross_linkable) +cross_compiling=$ac_cv_prog_cc_cross +]) + diff --git a/configure.in b/configure.in index 6afafb12..8f55c4c1 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION([$Id: configure.in,v 1.10 1996/09/25 01:49:10 miles Exp $]) +AC_REVISION([$Id: configure.in,v 1.11 1997/05/23 16:39:25 thomas Exp $]) AC_PREREQ(2.4) dnl Minimum Autoconf version required. AC_INIT(hurd/hurd_types.h) dnl A distinctive file to look for in srcdir. @@ -24,7 +24,7 @@ AC_PROG_INSTALL AC_CHECK_TOOL(CC, gcc) # That check handles cross-compilation well, but AC_PROG_CC tests for GCC # and sets default CFLAGS nicely for us, so do that too. -AC_PROG_CC +AC_PROG_CC_LOCAL # Require GCC. if test x$GCC != xyes; then AC_MSG_ERROR([this code uses GNU C extensions, you must compile with GCC]) |