diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2012-04-05 01:33:59 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2012-04-05 01:33:59 +0200 |
| commit | d9825184e1f34e007ab321099fed328e9616789a (patch) | |
| tree | b087e131a7c7b1265090ed5c02a26f44f83e2961 /aclocal.m4 | |
| parent | 14d9e2b1fd8298da6cd388d421553d6ee8159ef7 (diff) | |
| parent | 6a9c58703f282fc2491e5e67c8180f00da320ef8 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
posix/glob/configure
sysdeps/i386/sysdep.h
sysdeps/ia64/configure
sysdeps/mach/hurd/socket.c
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 57f6799b76..bee24a8f23 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -12,7 +12,6 @@ AC_PROVIDE([_AS_ECHO_PREPARE])dnl AC_PROVIDE([_AS_CR_PREPARE])dnl AC_PROVIDE([_AS_TR_SH_PREPARE])dnl AC_PROVIDE([AC_PROG_INSTALL])dnl -AC_PROVIDE([AC_PROG_RANLIB])dnl AC_PROVIDE([AC_PROG_CC])dnl AC_PROVIDE([AC_PROG_CPP])dnl AC_PROVIDE([_AS_PATH_SEPARATOR_PREPARE])dnl |