From ea96d1bb54b37bdca4130871b4376938c5a9b2e3 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Feb 2013 16:01:22 +0100 Subject: [PATCH 1/2] Rename configure.in to configure.ac Newer autoconf versions will not support the "configure.in" naming anymore, only "configure.ac". * configure.in: Move file... * configure.ac: ... here. --- configure.ac | 307 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 307 ---------------------------------------------------------- 2 files changed, 307 insertions(+), 307 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..31e48ef --- /dev/null +++ b/configure.ac @@ -0,0 +1,307 @@ +dnl Process this file with autoconf to produce a configure script. +AC_REVISION([$Id: configure.in,v 1.38 2008/11/17 11:34:18 tschwinge Exp $]) +AC_PREREQ(2.54) dnl Minimum Autoconf version required. +AC_INIT([GNU Hurd], [0.3], [bug-hurd@gnu.org]) +AC_CONFIG_SRCDIR([hurd/hurd_types.h]) dnl File to look for in srcdir. + +AC_PREFIX_DEFAULT() dnl Default to empty prefix, not /usr/local. + +AC_CANONICAL_HOST +case "$host_os" in +gnu*) ;; +none) AC_MSG_ERROR([ +*** You must specify a host of $host_cpu-gnu or $host_cpu-$host_vendor-gnu +*** to configure; you will need to use the same host specification +*** to configure other packages for the GNU/Hurd system.]) ;; +*) AC_MSG_ERROR([this is the gnu os, host cannot be $host_os +*** Host configuration must be \`MACHINE-gnu' or \`MACHINE-VENDOR-gnu'. +*** To cross-compile, you must specify both --host and --build; +*** for example \`--build=$host --host=$host_cpu-gnu'. +*** Run $0 --help for more information.]) ;; +esac + +case "$host_cpu" in +alpha*) + asm_syntax=alpha + ;; +arm*) + asm_syntax=arm + ;; +m68k | m680?0) + asm_syntax=m68k + ;; +mips*) + asm_syntax=mips + ;; +i?86) + asm_syntax=i386 + ;; +powerpc*) + asm_syntax=ppc + ;; +sparc64* | ultrasparc*) + asm_syntax=sparc64 + ;; +sparc*) + asm_syntax=sparc + ;; +*) + asm_syntax="$host_cpu" + ;; +esac +AC_SUBST(asm_syntax) + +test -r "$srcdir/libthreads/$asm_syntax/cthreads.h" || { + AC_MSG_WARN([unsupported CPU type $host_cpu]) +} + +AC_ARG_ENABLE(profile, +[ --disable-profile do not build profiled libraries and programs]) +AC_SUBST(enable_profile) + +define([default_static],['ext2fs,ufs'])dnl +AC_ARG_ENABLE(static-progs, +[ --enable-static-progs=PROGRAMS... + build statically-linked PROGRAM.static versions + of (only) the listed programs ]dnl +changequote(',')[default_static]changequote([,])) +case "$enable_static_progs" in +'no') enable_static_progs= ;; # we got --disable-static +'') enable_static_progs=default_static ;; +esac +# Convert comma/space-separated list into space-separated list. +enable_static_progs=`echo "$enable_static_progs" | sed 's/[[, ]][[, ]]*/ /g'` +AC_SUBST(enable_static_progs) + +[# Don't needlessly overwrite files that whose contents haven't changed. This +# helps for avoinding unneccessary recompilation cycles when keeping +# cross-compilation toolchains up-to-date. Thus, unconditionally use the +# supplied `install-sh', as the GNU Coreutils one doesn't provide this +# functionality yet (TODO: change that). TODO: $ac_abs_top_builddir et al. are +# not yet available here, that's why we use `readlink' (but only if available). +INSTALL="$SHELL $(readlink -f "$ac_install_sh")"\ -C || unset INSTALL] +AC_PROG_INSTALL +AC_PROG_AWK +AC_PROG_SED + +AC_PROG_CC +# Require GCC. +if test x$GCC != xyes; then + AC_MSG_ERROR([this code uses GNU C extensions, you must compile with GCC]) +fi + +AC_CHECK_TOOL(LD, ld) +AC_CHECK_TOOL(OBJCOPY, objcopy) +AC_CHECK_TOOL(AR, ar) +AC_CHECK_TOOL(RANLIB, ranlib) +AC_CHECK_TOOL(MIG, mig) +# Require MiG. +if test x${MIG} = x; then + AC_MSG_ERROR([ +*** You need GNU MiG to compile the GNU Hurd, please see +*** http://www.gnu.org/software/hurd/mig.html for further details, or +*** download it directly from the main GNU server (ftp.gnu.org) or any +*** GNU mirror.]) +fi + +dnl Let these propagate from the environment. +AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) + +# See if there's a separate libcrypt (many systems put crypt there). +AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt) +AC_SUBST(LIBCRYPT) + +hurd_MIG_RETCODE + +# See if --version-script is available. +AC_CACHE_CHECK(for ld --version-script, hurd_cv_ld_version_script_option, [dnl +cat > conftest.c <<\EOF +void foobar() {} +EOF +cat > conftest.map <<\EOF +VERS_1 { + global: sym; +}; + +VERS_2 { + global: sym; +} VERS_1; +EOF + +if AC_TRY_COMMAND([eval $ac_compile 1>&AS_MESSAGE_LOG_FD()]) && + AC_TRY_COMMAND([${CC-cc} $CFLAGS -shared -o conftest.so conftest.o + -nostartfiles -nostdlib + -Wl,--version-script,conftest.map + 1>&AS_MESSAGE_LOG_FD()]); then + hurd_cv_ld_version_script_option=yes +else + hurd_cv_ld_version_script_option=no +fi +rm -f conftest*]) + +# See if libc was built with --enable-libio. +AC_CACHE_CHECK([for libio], + hurd_cv_libio, + AC_TRY_COMPILE([#include +#ifndef _STDIO_USES_IOSTREAM +# error No libio found. +#endif],, + hurd_cv_libio=yes, + hurd_cv_libio=no)) + +# The versions of the symbols in libthreads have to match those in +# libc.so. Since the symbols in a libc that includes libio will be +# versioned differently from the ones in a libc that uses stdio, this +# isn't easy to accomplish. Instead we leave things unversioned if +# libio isn't found. +if test $hurd_cv_libio = yes; then + VERSIONING=$hurd_cv_ld_version_script_option +else + VERSIONING=no +fi +AC_SUBST(VERSIONING) + +# Check if libc contains getgrouplist and/or uselocale. +AC_CHECK_FUNCS(getgrouplist uselocale) + + +# From glibc HEAD, 2007-11-07. +AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl +cat > conftest.c <&AS_MESSAGE_LOG_FD]) +then + libc_cv_gnu89_inline=yes +else + libc_cv_gnu89_inline=no +fi +rm -f conftest*]) +if test $libc_cv_gnu89_inline = yes; then + libc_cv_gnu89_inline=-fgnu89-inline +else + libc_cv_gnu89_inline= +fi +AC_SUBST(libc_cv_gnu89_inline) + + +# Insist on libparted unless the user declines explicitely +AC_ARG_WITH([parted], + [AS_HELP_STRING([--without-parted], [disable user-space partition stores])], + [], + [with_parted=yes]) + +PARTED_LIBS= +AC_DEFUN([PARTED_FAIL], [ + AC_MSG_FAILURE([Please install required libraries or use --without-parted.]) +]) +AS_IF([test "x$with_parted" != xno], [ + AC_CHECK_HEADER([parted/parted.h], + [AC_DEFINE(HAVE_PARTED_PARTED_H)], + [PARTED_FAIL]) + AC_CHECK_LIB([parted], [ped_device_read], [], [PARTED_FAIL]) + AC_CHECK_LIB([uuid], [uuid_generate], [], [PARTED_FAIL]) + AC_CHECK_LIB([dl], [dlopen], [], [PARTED_FAIL]) + PARTED_LIBS="-lparted -luuid -ldl" +]) +AC_SUBST([PARTED_LIBS]) + +AC_ARG_ENABLE(boot-store-types, +[ --enable-boot-store-types=TYPES... + list of store types included in statically + linked filesystems used for booting])dnl +if test -z "$enable_boot_store_types"; then + boot_store_types='device remap gunzip bunzip2' + test -z "$PARTED_LIBS" || boot_store_types="$boot_store_types part" +elif test "x$enable_boot_store_types" = xno; then + AC_MSG_WARN([you probably wanted --disable-static-progs]) +else + boot_store_types="$enable_boot_store_types" +fi +AC_SUBST(boot_store_types)dnl +AC_MSG_CHECKING(boot store types) +AC_MSG_RESULT($boot_store_types) + +# Check for ncursesw, which is needed for the console-curses client. +hurd_LIB_NCURSESW + +AC_PROG_LEX +AC_PROG_YACC +AS_IF([test "$LEX" = ":" -o "$YACC" = ":"], [ +have_x11=no +AC_MSG_WARN([lex or yacc is mising, XKB will be disabled.]) +],[ +# Check for those Xorg modules needed for keyboard mappings. +PKG_CHECK_MODULES([X11], [x11 xproto], + [ have_x11=yes + pkg_failed=no + AC_MSG_CHECKING([for xkb base]) + _PKG_CONFIG([XKB_BASE], [variable=xkb_base], [xkeyboard-config]) + AS_IF([test $pkg_failed = no], + [XKB_BASE="$pkg_cv_XKB_BASE" + AC_MSG_RESULT([$XKB_BASE])], + [XKB_BASE="$datadir/share/X11/xkb" + AC_MSG_RESULT([(default) $XKB_BASE])]) + AC_MSG_CHECKING([for X11 prefix]) + _PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11]) + AS_IF([test $pkg_failed = no], + [X11_PREFIX="$pkg_cv_X11_PREFIX" + AC_MSG_RESULT([$X11_PREFIX])], + [X11_PREFIX="$prefix" + AC_MSG_RESULT([(default) $X11_PREFIX])]) + + have_keysymdef_h=no + AC_CHECK_HEADER([X11/keysymdef.h], + [AC_MSG_CHECKING([for X11/keysymdef.h absolute location]) + AC_PREPROC_IFELSE([#include ], + [[X11_KEYSYMDEF_H=`$SED -n 's%^[^"]*"\([^"]*X11/keysymdef.h\)".*$%\1%p' conftest.i`] + # did the sed magic above work? + AS_IF([test -f "$X11_KEYSYMDEF_H"], + [have_keysymdef_h=yes], + [X11_KEYSYMDEF_H=not-found]) + ], + [X11_KEYSYMDEF_H=not-found]) + AC_MSG_RESULT([$X11_KEYSYMDEF_H]) + ]) + AS_IF([test $have_keysymdef_h = no], + [AC_MSG_WARN([X11/keysymdef.h was not found, XKB will be disabled.]) + have_x11=no]) + ], [have_x11=no]) +]) +AC_SUBST([have_x11]) +AC_SUBST([XKB_BASE]) +AC_DEFINE_UNQUOTED([X11_PREFIX], "$X11_PREFIX") +AC_SUBST([X11_KEYSYMDEF_H]) + +# Check for Sun RPC headers and library. +AC_CHECK_HEADER([rpc/types.h], [HAVE_SUN_RPC=yes], [HAVE_SUN_RPC=no]) +AC_SEARCH_LIBS([clnt_create], [], [:], [HAVE_SUN_RPC=no]) +AC_SUBST([HAVE_SUN_RPC]) + +if test -f ./$ac_unique_file; then + # Configuring in source directory; don't create any Makefiles. + makefiles= +else + # We are configuring in a separate build tree. + # Create a Makefile in the top-level build directory and + # one for each subdirectory Makefile in the source. + makefiles="Makeconf:build.mkcf.in \ + `cd $srcdir; for file in Makefile */Makefile; do \ + echo ${file}:build.mk.in; done`" +fi + +AC_CONFIG_FILES([config.make ${makefiles}]) +AC_OUTPUT + +dnl Local Variables: +dnl comment-start: "dnl " +dnl comment-end: "" +dnl comment-start-skip: "\\bdnl\\b\\s *" +dnl compile-command: "autoconf" +dnl End: diff --git a/configure.in b/configure.in deleted file mode 100644 index 31e48ef..0000000 --- a/configure.in +++ /dev/null @@ -1,307 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_REVISION([$Id: configure.in,v 1.38 2008/11/17 11:34:18 tschwinge Exp $]) -AC_PREREQ(2.54) dnl Minimum Autoconf version required. -AC_INIT([GNU Hurd], [0.3], [bug-hurd@gnu.org]) -AC_CONFIG_SRCDIR([hurd/hurd_types.h]) dnl File to look for in srcdir. - -AC_PREFIX_DEFAULT() dnl Default to empty prefix, not /usr/local. - -AC_CANONICAL_HOST -case "$host_os" in -gnu*) ;; -none) AC_MSG_ERROR([ -*** You must specify a host of $host_cpu-gnu or $host_cpu-$host_vendor-gnu -*** to configure; you will need to use the same host specification -*** to configure other packages for the GNU/Hurd system.]) ;; -*) AC_MSG_ERROR([this is the gnu os, host cannot be $host_os -*** Host configuration must be \`MACHINE-gnu' or \`MACHINE-VENDOR-gnu'. -*** To cross-compile, you must specify both --host and --build; -*** for example \`--build=$host --host=$host_cpu-gnu'. -*** Run $0 --help for more information.]) ;; -esac - -case "$host_cpu" in -alpha*) - asm_syntax=alpha - ;; -arm*) - asm_syntax=arm - ;; -m68k | m680?0) - asm_syntax=m68k - ;; -mips*) - asm_syntax=mips - ;; -i?86) - asm_syntax=i386 - ;; -powerpc*) - asm_syntax=ppc - ;; -sparc64* | ultrasparc*) - asm_syntax=sparc64 - ;; -sparc*) - asm_syntax=sparc - ;; -*) - asm_syntax="$host_cpu" - ;; -esac -AC_SUBST(asm_syntax) - -test -r "$srcdir/libthreads/$asm_syntax/cthreads.h" || { - AC_MSG_WARN([unsupported CPU type $host_cpu]) -} - -AC_ARG_ENABLE(profile, -[ --disable-profile do not build profiled libraries and programs]) -AC_SUBST(enable_profile) - -define([default_static],['ext2fs,ufs'])dnl -AC_ARG_ENABLE(static-progs, -[ --enable-static-progs=PROGRAMS... - build statically-linked PROGRAM.static versions - of (only) the listed programs ]dnl -changequote(',')[default_static]changequote([,])) -case "$enable_static_progs" in -'no') enable_static_progs= ;; # we got --disable-static -'') enable_static_progs=default_static ;; -esac -# Convert comma/space-separated list into space-separated list. -enable_static_progs=`echo "$enable_static_progs" | sed 's/[[, ]][[, ]]*/ /g'` -AC_SUBST(enable_static_progs) - -[# Don't needlessly overwrite files that whose contents haven't changed. This -# helps for avoinding unneccessary recompilation cycles when keeping -# cross-compilation toolchains up-to-date. Thus, unconditionally use the -# supplied `install-sh', as the GNU Coreutils one doesn't provide this -# functionality yet (TODO: change that). TODO: $ac_abs_top_builddir et al. are -# not yet available here, that's why we use `readlink' (but only if available). -INSTALL="$SHELL $(readlink -f "$ac_install_sh")"\ -C || unset INSTALL] -AC_PROG_INSTALL -AC_PROG_AWK -AC_PROG_SED - -AC_PROG_CC -# Require GCC. -if test x$GCC != xyes; then - AC_MSG_ERROR([this code uses GNU C extensions, you must compile with GCC]) -fi - -AC_CHECK_TOOL(LD, ld) -AC_CHECK_TOOL(OBJCOPY, objcopy) -AC_CHECK_TOOL(AR, ar) -AC_CHECK_TOOL(RANLIB, ranlib) -AC_CHECK_TOOL(MIG, mig) -# Require MiG. -if test x${MIG} = x; then - AC_MSG_ERROR([ -*** You need GNU MiG to compile the GNU Hurd, please see -*** http://www.gnu.org/software/hurd/mig.html for further details, or -*** download it directly from the main GNU server (ftp.gnu.org) or any -*** GNU mirror.]) -fi - -dnl Let these propagate from the environment. -AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) - -# See if there's a separate libcrypt (many systems put crypt there). -AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt) -AC_SUBST(LIBCRYPT) - -hurd_MIG_RETCODE - -# See if --version-script is available. -AC_CACHE_CHECK(for ld --version-script, hurd_cv_ld_version_script_option, [dnl -cat > conftest.c <<\EOF -void foobar() {} -EOF -cat > conftest.map <<\EOF -VERS_1 { - global: sym; -}; - -VERS_2 { - global: sym; -} VERS_1; -EOF - -if AC_TRY_COMMAND([eval $ac_compile 1>&AS_MESSAGE_LOG_FD()]) && - AC_TRY_COMMAND([${CC-cc} $CFLAGS -shared -o conftest.so conftest.o - -nostartfiles -nostdlib - -Wl,--version-script,conftest.map - 1>&AS_MESSAGE_LOG_FD()]); then - hurd_cv_ld_version_script_option=yes -else - hurd_cv_ld_version_script_option=no -fi -rm -f conftest*]) - -# See if libc was built with --enable-libio. -AC_CACHE_CHECK([for libio], - hurd_cv_libio, - AC_TRY_COMPILE([#include -#ifndef _STDIO_USES_IOSTREAM -# error No libio found. -#endif],, - hurd_cv_libio=yes, - hurd_cv_libio=no)) - -# The versions of the symbols in libthreads have to match those in -# libc.so. Since the symbols in a libc that includes libio will be -# versioned differently from the ones in a libc that uses stdio, this -# isn't easy to accomplish. Instead we leave things unversioned if -# libio isn't found. -if test $hurd_cv_libio = yes; then - VERSIONING=$hurd_cv_ld_version_script_option -else - VERSIONING=no -fi -AC_SUBST(VERSIONING) - -# Check if libc contains getgrouplist and/or uselocale. -AC_CHECK_FUNCS(getgrouplist uselocale) - - -# From glibc HEAD, 2007-11-07. -AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl -cat > conftest.c <&AS_MESSAGE_LOG_FD]) -then - libc_cv_gnu89_inline=yes -else - libc_cv_gnu89_inline=no -fi -rm -f conftest*]) -if test $libc_cv_gnu89_inline = yes; then - libc_cv_gnu89_inline=-fgnu89-inline -else - libc_cv_gnu89_inline= -fi -AC_SUBST(libc_cv_gnu89_inline) - - -# Insist on libparted unless the user declines explicitely -AC_ARG_WITH([parted], - [AS_HELP_STRING([--without-parted], [disable user-space partition stores])], - [], - [with_parted=yes]) - -PARTED_LIBS= -AC_DEFUN([PARTED_FAIL], [ - AC_MSG_FAILURE([Please install required libraries or use --without-parted.]) -]) -AS_IF([test "x$with_parted" != xno], [ - AC_CHECK_HEADER([parted/parted.h], - [AC_DEFINE(HAVE_PARTED_PARTED_H)], - [PARTED_FAIL]) - AC_CHECK_LIB([parted], [ped_device_read], [], [PARTED_FAIL]) - AC_CHECK_LIB([uuid], [uuid_generate], [], [PARTED_FAIL]) - AC_CHECK_LIB([dl], [dlopen], [], [PARTED_FAIL]) - PARTED_LIBS="-lparted -luuid -ldl" -]) -AC_SUBST([PARTED_LIBS]) - -AC_ARG_ENABLE(boot-store-types, -[ --enable-boot-store-types=TYPES... - list of store types included in statically - linked filesystems used for booting])dnl -if test -z "$enable_boot_store_types"; then - boot_store_types='device remap gunzip bunzip2' - test -z "$PARTED_LIBS" || boot_store_types="$boot_store_types part" -elif test "x$enable_boot_store_types" = xno; then - AC_MSG_WARN([you probably wanted --disable-static-progs]) -else - boot_store_types="$enable_boot_store_types" -fi -AC_SUBST(boot_store_types)dnl -AC_MSG_CHECKING(boot store types) -AC_MSG_RESULT($boot_store_types) - -# Check for ncursesw, which is needed for the console-curses client. -hurd_LIB_NCURSESW - -AC_PROG_LEX -AC_PROG_YACC -AS_IF([test "$LEX" = ":" -o "$YACC" = ":"], [ -have_x11=no -AC_MSG_WARN([lex or yacc is mising, XKB will be disabled.]) -],[ -# Check for those Xorg modules needed for keyboard mappings. -PKG_CHECK_MODULES([X11], [x11 xproto], - [ have_x11=yes - pkg_failed=no - AC_MSG_CHECKING([for xkb base]) - _PKG_CONFIG([XKB_BASE], [variable=xkb_base], [xkeyboard-config]) - AS_IF([test $pkg_failed = no], - [XKB_BASE="$pkg_cv_XKB_BASE" - AC_MSG_RESULT([$XKB_BASE])], - [XKB_BASE="$datadir/share/X11/xkb" - AC_MSG_RESULT([(default) $XKB_BASE])]) - AC_MSG_CHECKING([for X11 prefix]) - _PKG_CONFIG([X11_PREFIX], [variable=prefix], [x11]) - AS_IF([test $pkg_failed = no], - [X11_PREFIX="$pkg_cv_X11_PREFIX" - AC_MSG_RESULT([$X11_PREFIX])], - [X11_PREFIX="$prefix" - AC_MSG_RESULT([(default) $X11_PREFIX])]) - - have_keysymdef_h=no - AC_CHECK_HEADER([X11/keysymdef.h], - [AC_MSG_CHECKING([for X11/keysymdef.h absolute location]) - AC_PREPROC_IFELSE([#include ], - [[X11_KEYSYMDEF_H=`$SED -n 's%^[^"]*"\([^"]*X11/keysymdef.h\)".*$%\1%p' conftest.i`] - # did the sed magic above work? - AS_IF([test -f "$X11_KEYSYMDEF_H"], - [have_keysymdef_h=yes], - [X11_KEYSYMDEF_H=not-found]) - ], - [X11_KEYSYMDEF_H=not-found]) - AC_MSG_RESULT([$X11_KEYSYMDEF_H]) - ]) - AS_IF([test $have_keysymdef_h = no], - [AC_MSG_WARN([X11/keysymdef.h was not found, XKB will be disabled.]) - have_x11=no]) - ], [have_x11=no]) -]) -AC_SUBST([have_x11]) -AC_SUBST([XKB_BASE]) -AC_DEFINE_UNQUOTED([X11_PREFIX], "$X11_PREFIX") -AC_SUBST([X11_KEYSYMDEF_H]) - -# Check for Sun RPC headers and library. -AC_CHECK_HEADER([rpc/types.h], [HAVE_SUN_RPC=yes], [HAVE_SUN_RPC=no]) -AC_SEARCH_LIBS([clnt_create], [], [:], [HAVE_SUN_RPC=no]) -AC_SUBST([HAVE_SUN_RPC]) - -if test -f ./$ac_unique_file; then - # Configuring in source directory; don't create any Makefiles. - makefiles= -else - # We are configuring in a separate build tree. - # Create a Makefile in the top-level build directory and - # one for each subdirectory Makefile in the source. - makefiles="Makeconf:build.mkcf.in \ - `cd $srcdir; for file in Makefile */Makefile; do \ - echo ${file}:build.mk.in; done`" -fi - -AC_CONFIG_FILES([config.make ${makefiles}]) -AC_OUTPUT - -dnl Local Variables: -dnl comment-start: "dnl " -dnl comment-end: "" -dnl comment-start-skip: "\\bdnl\\b\\s *" -dnl compile-command: "autoconf" -dnl End: -- 1.7.10.4