diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/dhcpv6/patches/patch-configure_ac | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/dhcpv6/patches/patch-configure_ac')
| -rw-r--r-- | package/dhcpv6/patches/patch-configure_ac | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/package/dhcpv6/patches/patch-configure_ac b/package/dhcpv6/patches/patch-configure_ac new file mode 100644 index 000000000..3ca204c05 --- /dev/null +++ b/package/dhcpv6/patches/patch-configure_ac @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- dhcpv6-1.2.0.orig/configure.ac 2009-04-03 04:33:56.000000000 +0200 ++++ dhcpv6-1.2.0/configure.ac 2009-05-28 23:10:31.256646671 +0200 +@@ -45,7 +45,7 @@ AC_CHECK_HEADERS([sys/types.h sys/socket + # Check for headers we must have on the system + AC_CHECK_HEADERS([arpa/inet.h err.h errno.h getopt.h fcntl.h ifaddrs.h \ + libgen.h net/if.h net/if_arp.h netdb.h netinet/in.h \ +- sys/ioctl.h sys/timeb.h syslog.h], ++ sys/ioctl.h syslog.h], + [], + [AC_MSG_FAILURE([*** Header file $ac_header not found.])], + [[#ifdef HAVE_SYS_TYPES_H +@@ -97,7 +97,7 @@ AC_FUNC_REALLOC + AC_FUNC_SELECT_ARGTYPES + AC_TYPE_SIGNAL + AC_FUNC_STAT +-AC_CHECK_FUNCS([bzero ftime gettimeofday memset select socket strchr strdup \ ++AC_CHECK_FUNCS([gettimeofday memset select socket strchr strdup \ + strerror strrchr strstr strtol strtoul], + [], + [AC_MSG_FAILURE([*** Required function $ac_func not found.])]) |