Package: pistachio Version: 0.4 + CVS Author: Guillem Jover Status: applied Description: Updated configure.in to latest autoconf, so no more warnings. diff -Naur pistachio-cvs/user/configure.in pistachio.new/user/configure.in --- pistachio-cvs/user/configure.in 2004-05-19 03:03:39.000000000 +0200 +++ pistachio.new/user/configure.in 2004-05-19 03:23:36.000000000 +0200 @@ -31,8 +31,8 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(Pistachio, 0.4) -AC_CONFIG_SRCDIR(serv/sigma0/sigma0.cc) +AC_INIT([Pistachio], [0.4]) +AC_CONFIG_SRCDIR([serv/sigma0/sigma0.cc]) if test "x$host_alias" != x; then # We do not necessarily need crt0 and friends when cross-compiling. @@ -101,9 +101,9 @@ esac fi - AC_CHECK_PROGS(CROSSCC, - $host_alias-gcc $gcc_prefix-elf-gcc $gcc_prefix-unknown-elf-gcc \ - $gcc_prefix-linux-gcc $gcc_prefix-unknown-linux-gcc) + AC_CHECK_PROGS([CROSSCC], + [$host_alias-gcc $gcc_prefix-elf-gcc $gcc_prefix-unknown-elf-gcc \ + $gcc_prefix-linux-gcc $gcc_prefix-unknown-linux-gcc]) fi if test "x$CROSSCC" != x; then @@ -111,7 +111,7 @@ fi dnl Autoheader stuff. -AC_CONFIG_HEADERS(config.h) +AC_CONFIG_HEADERS([config.h]) dnl Checks for programs. @@ -122,57 +122,57 @@ AC_PROG_AWK dnl Configure parameters -AC_ARG_WITH(comport, - AC_HELP_STRING([--with-comport=PORT], - [comport to user for serial I/O [[0]]]), - CONFIG_COMPORT=`echo $withval | sed 's/yes/0/'`, CONFIG_COMPORT=no) +AC_ARG_WITH([comport], + [AS_HELP_STRING([--with-comport=PORT], + [comport to user for serial I/O [0]])], + [CONFIG_COMPORT=`echo $withval | sed 's/yes/0/'`], [CONFIG_COMPORT=no]) if test "x$CONFIG_COMPORT" != xno; then - AC_DEFINE_UNQUOTED(CONFIG_COMPORT, $CONFIG_COMPORT, + AC_DEFINE_UNQUOTED([CONFIG_COMPORT], [$CONFIG_COMPORT], [Define to the appropriate I/O comport (0-3).]) fi -AC_ARG_WITH(comspeed, - AC_HELP_STRING([--with-comspeed=SPEED], - [select speed for comport [[115200]]]), - COMSPEED=$withval, COMSPEED=115200) +AC_ARG_WITH([comspeed], + [AS_HELP_STRING([--with-comspeed=SPEED], + [select speed for comport [115200]])], + [COMSPEED=$withval], [COMSPEED=115200]) if test "x$CONFIG_COMPORT" != xno; then - AC_DEFINE_UNQUOTED(CONFIG_COMSPEED, $COMSPEED, + AC_DEFINE_UNQUOTED([CONFIG_COMSPEED], [$COMSPEED], [Baud rate for comport (typically 115200, 57600, or 38400).]) fi -AC_ARG_WITH(kickstart-linkbase, - AC_HELP_STRING([--with-kickstart-linkbase=BASE], - [link-base for kickstart [[architecture-dependent]]]), - KICKSTART_LINKBASE=$withval, KICKSTART_LINKBASE=no) - -AC_ARG_WITH(s0-linkbase, - AC_HELP_STRING([--with-s0-linkbase=BASE], - [link-base for sigma0 [[architecture-dependent]]]), - SIGMA0_LINKBASE=$withval, SIGMA0_LINKBASE=no) - -AC_ARG_WITH(roottask-linkbase, - AC_HELP_STRING([--with-roottask-linkbase=BASE], - [link-base for root task [[architecture-dependent]]]), - ROOTTASK_LINKBASE=$withval, ROOTTASK_LINKBASE=no) - -AC_ARG_WITH(kerneldir, - AC_HELP_STRING([--with-kerneldir=DIR], - [build directory of kernel [[guess]]]), - kerneldir=$withval, kerneldir=no) +AC_ARG_WITH([kickstart-linkbase], + [AS_HELP_STRING([--with-kickstart-linkbase=BASE], + [link-base for kickstart [architecture-dependent]])], + [KICKSTART_LINKBASE=$withval], [KICKSTART_LINKBASE=no]) + +AC_ARG_WITH([s0-linkbase], + [AS_HELP_STRING([--with-s0-linkbase=BASE], + [link-base for sigma0 [architecture-dependent]])], + [SIGMA0_LINKBASE=$withval], [SIGMA0_LINKBASE=no]) + +AC_ARG_WITH([roottask-linkbase], + [AS_HELP_STRING([--with-roottask-linkbase=BASE], + [link-base for root task [architecture-dependent]])], + [ROOTTASK_LINKBASE=$withval], [ROOTTASK_LINKBASE=no]) + +AC_ARG_WITH([kerneldir], + [AS_HELP_STRING([--with-kerneldir=DIR], + [build directory of kernel [guess]])], + [kerneldir=$withval], [kerneldir=no]) dnl Find prefix to use for gcc/binutils programs. TOOLPREFIX=`echo $CC | sed 's,gcc[[^/]]*$,,'` -AC_SUBST(TOOLPREFIX) +AC_SUBST([TOOLPREFIX]) dnl Find location of libgcc.a -AC_MSG_CHECKING(location of libgcc.a) +AC_MSG_CHECKING([location of libgcc.a]) LIBGCC=`$CC -print-libgcc-file-name` LIBGCCDIR=`echo $LIBGCC | sed 's,/[[^/]]*$,,'` -AC_MSG_RESULT($LIBGCCDIR) +AC_MSG_RESULT([$LIBGCCDIR]) dnl Find location of stdarg.h include file -AC_MSG_CHECKING(location of stdarg.h) +AC_MSG_CHECKING([location of stdarg.h]) testdir=`echo $LIBGCC | sed 's,/[[^/]]*$,/include,'` if test -f "$testdir/stdarg.h"; then STDARGDIR=$testdir @@ -184,14 +184,14 @@ fi if test "x$STDARGDIR" != x; then - AC_MSG_RESULT($STDARGDIR) + AC_MSG_RESULT([$STDARGDIR]) else - AC_MSG_ERROR(stdarg.h not found) + AC_MSG_ERROR([stdarg.h not found]) fi dnl Guess build directory of kernel -AC_MSG_CHECKING(kernel build directory) +AC_MSG_CHECKING([kernel build directory]) case $kerneldir in yes|no) my_builddir=`pwd` @@ -232,7 +232,7 @@ fi ;; esac -AC_MSG_RESULT($kerneldir) +AC_MSG_RESULT([$kerneldir]) dnl Set compiler/linker flags. @@ -288,25 +288,25 @@ arm-pleb) PLAT=pleb CFLAGS="$CFLAGS -O2 -march=armv4" - AC_SUBST(PLAT) + AC_SUBST([PLAT]) ;; mips64-erpcn01) CFLAGS="$CFLAGS -G 0 -mlong64 -mno-abicalls -non_shared -msplit-addresses -EL -mcpu=r5000 -mips4 -mabi=64 -Wa,-mabi=o64 -DMIPS64_LITTLE_ENDIAN" LDFLAGS="$LDFLAGS -EL" PLAT=erpcn01 - AC_SUBST(PLAT) + AC_SUBST([PLAT]) ;; mips64-vr41xx) CFLAGS="$CFLAGS -G 0 -mlong64 -mno-abicalls -non_shared -msplit-addresses -EL -mcpu=r4000 -mips3 -mabi=64 -Wa,-mabi=o64 -DMIPS64_LITTLE_ENDIAN" LDFLAGS="$LDFLAGS -EL" PLAT=vr41xx - AC_SUBST(PLAT) + AC_SUBST([PLAT]) ;; mips64-u4600|mips64*) CFLAGS="$CFLAGS -G 0 -mlong64 -mno-abicalls -non_shared -msplit-addresses -EB -mcpu=r4000 -mips3 -mabi=64 -Wa,-mabi=o64 -DMIPS64_BIG_ENDIAN" LDFLAGS="$LDFLAGS -EB" PLAT=u4600 - AC_SUBST(PLAT) + AC_SUBST([PLAT]) ;; powerpc64*) CFLAGS="$CFLAGS -msoft-float -mminimal-toc" @@ -314,7 +314,7 @@ alpha*) CFLAGS="$CFLAGS -mno-fp-regs -freg-struct-return" PLAT=srm - AC_SUBST(PLAT) + AC_SUBST([PLAT]) ;; esac @@ -336,16 +336,16 @@ ;; esac -AC_SUBST(CXXFLAGS) -AC_SUBST(ARCH) -AC_SUBST(KICKSTART_LINKBASE) -AC_SUBST(SIGMA0_LINKBASE) -AC_SUBST(ROOTTASK_LINKBASE) -AC_SUBST(kerneldir) +AC_SUBST([CXXFLAGS]) +AC_SUBST([ARCH]) +AC_SUBST([KICKSTART_LINKBASE]) +AC_SUBST([SIGMA0_LINKBASE]) +AC_SUBST([ROOTTASK_LINKBASE]) +AC_SUBST([kerneldir]) dnl Modified files. -AC_OUTPUT( +AC_CONFIG_FILES([ config.mk Makefile lib/Makefile @@ -364,4 +364,6 @@ util/piggybacker/ofppc64/Makefile contrib/Makefile contrib/elf-loader/Makefile -) +]) +AC_OUTPUT +