From cb8a6dbd176ee59d61068bed92e2c8d22bd28b13 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 30 Oct 2013 13:20:52 +1000 Subject: rename configure.in to configure.ac Autoconf has been deprecating configure.in for quite a long time. Rename all our configure.in and preconfigure.in files to .ac. Signed-off-by: Mike Frysinger --- sysdeps/mach/configure | 2 +- sysdeps/mach/configure.ac | 126 +++++++++++++++++++++++++++++++++++++++++ sysdeps/mach/configure.in | 126 ----------------------------------------- sysdeps/mach/hurd/configure | 2 +- sysdeps/mach/hurd/configure.ac | 31 ++++++++++ sysdeps/mach/hurd/configure.in | 31 ---------- 6 files changed, 159 insertions(+), 159 deletions(-) create mode 100644 sysdeps/mach/configure.ac delete mode 100644 sysdeps/mach/configure.in create mode 100644 sysdeps/mach/hurd/configure.ac delete mode 100644 sysdeps/mach/hurd/configure.in (limited to 'sysdeps/mach') diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index 3af3725..61ac7d9 100644 --- a/sysdeps/mach/configure +++ b/sysdeps/mach/configure @@ -65,7 +65,7 @@ $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_preproc -# This file is generated from configure.in by Autoconf. DO NOT EDIT! +# This file is generated from configure.ac by Autoconf. DO NOT EDIT! if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args. diff --git a/sysdeps/mach/configure.ac b/sysdeps/mach/configure.ac new file mode 100644 index 0000000..db85f47 --- /dev/null +++ b/sysdeps/mach/configure.ac @@ -0,0 +1,126 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. + +AC_CHECK_TOOL(MIG, mig, MISSING) +if test "x$MIG" = xMISSING; then + AC_MSG_ERROR([cannot find required build tool mig]) +fi +LIBC_CONFIG_VAR([MIG], [$MIG]) + +### Sanity checks for Mach header installation +AC_CHECK_HEADER(mach/mach_types.h,, + [AC_MSG_ERROR([cannot find Mach headers])], -) +AC_CHECK_HEADER(mach/mach_types.defs,, [dnl +AC_MSG_ERROR([cannot find Mach .defs files])], -) + +dnl +dnl mach_TYPE_CHECK(foo_t, bar_t) +dnl +dnl Check if foo_t is defined by . +dnl If not, compile with -Dfoo_t=bar_t. +dnl +AC_DEFUN([mach_TYPE_CHECK], [dnl +AC_CACHE_CHECK(for $1 in mach/mach_types.h, libc_cv_mach_$1, +AC_TRY_COMPILE([#include ], [extern $1 foo;], +libc_cv_mach_$1=$1, libc_cv_mach_$1=$2)) +if test [$]libc_cv_mach_$1 != $1; then + DEFINES="$DEFINES -D$1=$2" +fi]) + +dnl +dnl OSF Mach has renamed these typedefs for some reason. +dnl +mach_TYPE_CHECK(task_t, task_port_t) +mach_TYPE_CHECK(thread_t, thread_port_t) + +dnl +dnl The creation_time field is a GNU Mach addition the other variants lack. +dnl +AC_CACHE_CHECK(for creation_time in task_basic_info, + libc_cv_mach_task_creation_time, [dnl +AC_TRY_COMPILE([#include ], [ +extern struct task_basic_info *i; +long s = i->creation_time.seconds; +], libc_cv_mach_task_creation_time=yes, libc_cv_mach_task_creation_time=no)]) +if test $libc_cv_mach_task_creation_time = no; then + AC_MSG_ERROR([you need Mach headers supporting task_info.creation_time]) +fi + +dnl +dnl The Darwin variant no longer has +dnl but instead has several constituent .defs files. +dnl In this scenario we will presume there is a +dnl that contains an #include for each constituent header file, +dnl but we don't do a check for that here because in a bare +dnl environment the compile against those headers will fail. +dnl +mach_interface_list= +for ifc in mach mach4 \ + clock clock_priv host_priv host_security ledger lock_set \ + processor processor_set task thread_act vm_map \ + memory_object memory_object_default default_pager \ + i386/mach_i386 \ + ; do + AC_CHECK_HEADER(mach/${ifc}.defs, [dnl + mach_interface_list="$mach_interface_list $ifc"],, -) +done +if test "x$mach_interface_list" = x; then + AC_MSG_ERROR([what manner of Mach is this?]) +fi + +AC_CACHE_CHECK(for host_page_size in mach_host.defs, + libc_cv_mach_host_page_size, [dnl +AC_EGREP_HEADER(host_page_size, mach/mach_host.defs, + libc_cv_mach_host_page_size=yes, + libc_cv_mach_host_page_size=no)]) +if test $libc_cv_mach_host_page_size = yes; then + AC_DEFINE([HAVE_HOST_PAGE_SIZE]) +fi + +AC_CHECK_HEADER(mach/machine/ndr_def.h, [dnl + DEFINES="$DEFINES -DNDR_DEF_HEADER=''"], [dnl +AC_CHECK_HEADER(machine/ndr_def.h, [dnl + DEFINES="$DEFINES -DNDR_DEF_HEADER=''"],, -)], -) + +AC_CACHE_CHECK(for i386_io_perm_modify in mach_i386.defs, + libc_cv_mach_i386_ioports, [dnl +AC_EGREP_HEADER(i386_io_perm_modify, mach/i386/mach_i386.defs, + libc_cv_mach_i386_ioports=yes, + libc_cv_mach_i386_ioports=no)]) +if test $libc_cv_mach_i386_ioports = yes; then + AC_DEFINE([HAVE_I386_IO_PERM_MODIFY]) +fi + +AC_CACHE_CHECK(for i386_set_gdt in mach_i386.defs, + libc_cv_mach_i386_gdt, [dnl +AC_EGREP_HEADER(i386_set_gdt, mach/i386/mach_i386.defs, + libc_cv_mach_i386_gdt=yes, + libc_cv_mach_i386_gdt=no)]) +if test $libc_cv_mach_i386_gdt = yes; then + AC_DEFINE([HAVE_I386_SET_GDT]) +fi + +dnl Swiped from hurd/aclocal.m4 +AC_DEFUN([hurd_MIG_RETCODE], [dnl +# See if mig groks `retcode'. +AC_CACHE_CHECK(whether $MIG supports the retcode keyword, hurd_cv_mig_retcode, +[cat > conftest.defs <<\EOF +#include +#include +subsystem foobar 1000; +type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE + ctype: mach_port_t; +simpleroutine foobar_reply ( + reply_port: reply_port_t; + err: kern_return_t, RetCode); +EOF +if AC_TRY_COMMAND([CC="${CC}" ${MIG-false} -n conftest.defs 1>&AS_MESSAGE_LOG_FD]); then + hurd_cv_mig_retcode=yes +else + hurd_cv_mig_retcode=no +fi +rm -f conftest*]) +if test $hurd_cv_mig_retcode = yes; then + AC_DEFINE(HAVE_MIG_RETCODE) +fi]) + +hurd_MIG_RETCODE diff --git a/sysdeps/mach/configure.in b/sysdeps/mach/configure.in deleted file mode 100644 index db85f47..0000000 --- a/sysdeps/mach/configure.in +++ /dev/null @@ -1,126 +0,0 @@ -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - -AC_CHECK_TOOL(MIG, mig, MISSING) -if test "x$MIG" = xMISSING; then - AC_MSG_ERROR([cannot find required build tool mig]) -fi -LIBC_CONFIG_VAR([MIG], [$MIG]) - -### Sanity checks for Mach header installation -AC_CHECK_HEADER(mach/mach_types.h,, - [AC_MSG_ERROR([cannot find Mach headers])], -) -AC_CHECK_HEADER(mach/mach_types.defs,, [dnl -AC_MSG_ERROR([cannot find Mach .defs files])], -) - -dnl -dnl mach_TYPE_CHECK(foo_t, bar_t) -dnl -dnl Check if foo_t is defined by . -dnl If not, compile with -Dfoo_t=bar_t. -dnl -AC_DEFUN([mach_TYPE_CHECK], [dnl -AC_CACHE_CHECK(for $1 in mach/mach_types.h, libc_cv_mach_$1, -AC_TRY_COMPILE([#include ], [extern $1 foo;], -libc_cv_mach_$1=$1, libc_cv_mach_$1=$2)) -if test [$]libc_cv_mach_$1 != $1; then - DEFINES="$DEFINES -D$1=$2" -fi]) - -dnl -dnl OSF Mach has renamed these typedefs for some reason. -dnl -mach_TYPE_CHECK(task_t, task_port_t) -mach_TYPE_CHECK(thread_t, thread_port_t) - -dnl -dnl The creation_time field is a GNU Mach addition the other variants lack. -dnl -AC_CACHE_CHECK(for creation_time in task_basic_info, - libc_cv_mach_task_creation_time, [dnl -AC_TRY_COMPILE([#include ], [ -extern struct task_basic_info *i; -long s = i->creation_time.seconds; -], libc_cv_mach_task_creation_time=yes, libc_cv_mach_task_creation_time=no)]) -if test $libc_cv_mach_task_creation_time = no; then - AC_MSG_ERROR([you need Mach headers supporting task_info.creation_time]) -fi - -dnl -dnl The Darwin variant no longer has -dnl but instead has several constituent .defs files. -dnl In this scenario we will presume there is a -dnl that contains an #include for each constituent header file, -dnl but we don't do a check for that here because in a bare -dnl environment the compile against those headers will fail. -dnl -mach_interface_list= -for ifc in mach mach4 \ - clock clock_priv host_priv host_security ledger lock_set \ - processor processor_set task thread_act vm_map \ - memory_object memory_object_default default_pager \ - i386/mach_i386 \ - ; do - AC_CHECK_HEADER(mach/${ifc}.defs, [dnl - mach_interface_list="$mach_interface_list $ifc"],, -) -done -if test "x$mach_interface_list" = x; then - AC_MSG_ERROR([what manner of Mach is this?]) -fi - -AC_CACHE_CHECK(for host_page_size in mach_host.defs, - libc_cv_mach_host_page_size, [dnl -AC_EGREP_HEADER(host_page_size, mach/mach_host.defs, - libc_cv_mach_host_page_size=yes, - libc_cv_mach_host_page_size=no)]) -if test $libc_cv_mach_host_page_size = yes; then - AC_DEFINE([HAVE_HOST_PAGE_SIZE]) -fi - -AC_CHECK_HEADER(mach/machine/ndr_def.h, [dnl - DEFINES="$DEFINES -DNDR_DEF_HEADER=''"], [dnl -AC_CHECK_HEADER(machine/ndr_def.h, [dnl - DEFINES="$DEFINES -DNDR_DEF_HEADER=''"],, -)], -) - -AC_CACHE_CHECK(for i386_io_perm_modify in mach_i386.defs, - libc_cv_mach_i386_ioports, [dnl -AC_EGREP_HEADER(i386_io_perm_modify, mach/i386/mach_i386.defs, - libc_cv_mach_i386_ioports=yes, - libc_cv_mach_i386_ioports=no)]) -if test $libc_cv_mach_i386_ioports = yes; then - AC_DEFINE([HAVE_I386_IO_PERM_MODIFY]) -fi - -AC_CACHE_CHECK(for i386_set_gdt in mach_i386.defs, - libc_cv_mach_i386_gdt, [dnl -AC_EGREP_HEADER(i386_set_gdt, mach/i386/mach_i386.defs, - libc_cv_mach_i386_gdt=yes, - libc_cv_mach_i386_gdt=no)]) -if test $libc_cv_mach_i386_gdt = yes; then - AC_DEFINE([HAVE_I386_SET_GDT]) -fi - -dnl Swiped from hurd/aclocal.m4 -AC_DEFUN([hurd_MIG_RETCODE], [dnl -# See if mig groks `retcode'. -AC_CACHE_CHECK(whether $MIG supports the retcode keyword, hurd_cv_mig_retcode, -[cat > conftest.defs <<\EOF -#include -#include -subsystem foobar 1000; -type reply_port_t = polymorphic | MACH_MSG_TYPE_PORT_SEND_ONCE - ctype: mach_port_t; -simpleroutine foobar_reply ( - reply_port: reply_port_t; - err: kern_return_t, RetCode); -EOF -if AC_TRY_COMMAND([CC="${CC}" ${MIG-false} -n conftest.defs 1>&AS_MESSAGE_LOG_FD]); then - hurd_cv_mig_retcode=yes -else - hurd_cv_mig_retcode=no -fi -rm -f conftest*]) -if test $hurd_cv_mig_retcode = yes; then - AC_DEFINE(HAVE_MIG_RETCODE) -fi]) - -hurd_MIG_RETCODE diff --git a/sysdeps/mach/hurd/configure b/sysdeps/mach/hurd/configure index 84948a5..a0f9721 100644 --- a/sysdeps/mach/hurd/configure +++ b/sysdeps/mach/hurd/configure @@ -1,4 +1,4 @@ -# This file is generated from configure.in by Autoconf. DO NOT EDIT! +# This file is generated from configure.ac by Autoconf. DO NOT EDIT! $as_echo "#define NO_HIDDEN 1" >>confdefs.h diff --git a/sysdeps/mach/hurd/configure.ac b/sysdeps/mach/hurd/configure.ac new file mode 100644 index 0000000..ad915a5 --- /dev/null +++ b/sysdeps/mach/hurd/configure.ac @@ -0,0 +1,31 @@ +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. + +dnl We need this setting because of the need for PLT calls in ld.so. +AC_DEFINE([NO_HIDDEN]) + +# Don't bother trying to generate any glue code to be compatible with the +# existing system library, because we are the only system library. +inhibit_glue=yes + +case "$machine" in + i386*) + # The default oldest ABI is 2.2.6. + # We only need a "yes" here if the oldest ABI supported will be < 2.2.6. + if test "$oldest_abi" != default && test "$oldest_abi" \< "2.2.6"; then + libc_cv_gcc_unwind_find_fde=yes + fi + ;; +esac + +AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl +AC_TRY_COMPILE(dnl +[#include ], [ +#define NEED_VERSION 20020609 +#if HURD_INTERFACE_VERSION < NEED_VERSION +# error Hurd version too old: HURD_INTERFACE_VERSION < NEED_VERSION +#endif], + libc_cv_hurd_version=ok, + libc_cv_hurd_version=bad)]) +if test "x$libc_cv_hurd_version" != xok; then + AC_MSG_ERROR(Hurd headers not installed or too old) +fi diff --git a/sysdeps/mach/hurd/configure.in b/sysdeps/mach/hurd/configure.in deleted file mode 100644 index ad915a5..0000000 --- a/sysdeps/mach/hurd/configure.in +++ /dev/null @@ -1,31 +0,0 @@ -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. - -dnl We need this setting because of the need for PLT calls in ld.so. -AC_DEFINE([NO_HIDDEN]) - -# Don't bother trying to generate any glue code to be compatible with the -# existing system library, because we are the only system library. -inhibit_glue=yes - -case "$machine" in - i386*) - # The default oldest ABI is 2.2.6. - # We only need a "yes" here if the oldest ABI supported will be < 2.2.6. - if test "$oldest_abi" != default && test "$oldest_abi" \< "2.2.6"; then - libc_cv_gcc_unwind_find_fde=yes - fi - ;; -esac - -AC_CACHE_CHECK(Hurd header version, libc_cv_hurd_version, [dnl -AC_TRY_COMPILE(dnl -[#include ], [ -#define NEED_VERSION 20020609 -#if HURD_INTERFACE_VERSION < NEED_VERSION -# error Hurd version too old: HURD_INTERFACE_VERSION < NEED_VERSION -#endif], - libc_cv_hurd_version=ok, - libc_cv_hurd_version=bad)]) -if test "x$libc_cv_hurd_version" != xok; then - AC_MSG_ERROR(Hurd headers not installed or too old) -fi -- cgit v1.1