summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/aclocal.m42
-rwxr-xr-xsim/common/configure50
3 files changed, 55 insertions, 2 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 48a2b63bd43..72068394268 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-29 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * aclocal.m4 (SIM_CHECK_MEMBER): Use AU_ALIAS to define, not defn.
+ * configure: Regenerate.
+
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* config.in: Regenerate.
diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4
index 24b1aa24861..6820164f80e 100644
--- a/sim/common/aclocal.m4
+++ b/sim/common/aclocal.m4
@@ -945,7 +945,7 @@ dnl
dnl ---------------------------------------------------------
dnl AGGREGATE.MEMBER is for instance `struct passwd.pw_gecos', shell
dnl variables are not a valid argument.
-AC_DEFUN([SIM_CHECK_MEMBER], defn([AC_CHECK_MEMBER]))
+AU_ALIAS([SIM_CHECK_MEMBER], [AC_CHECK_MEMBER])
dnl
dnl Translated from a FC2 autoconf-2.59-3 installation.
dnl SIM_CHECK_MEMBERS([AGGREGATE.MEMBER, ...])
diff --git a/sim/common/configure b/sim/common/configure
index 1575b2c3df7..1cc9897e0d9 100755
--- a/sim/common/configure
+++ b/sim/common/configure
@@ -1800,7 +1800,55 @@ $as_echo "$ac_res" >&6; }
# INCLUDES, setting cache variable VAR accordingly.
ac_fn_c_check_member ()
{
-_SIM_CHECK_MEMBER_BODY
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$4=yes"
+else
+ eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
} # ac_fn_c_check_member
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while