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/bind/Config.in | |
| 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/bind/Config.in')
| -rw-r--r-- | package/bind/Config.in | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/package/bind/Config.in b/package/bind/Config.in index b9eef008a..1286057ba 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -8,21 +8,6 @@ config ADK_DUMMY_BIND tristate default n -config ADK_PACKAGE_BIND_TOOLS - prompt "bind-tools........................ Bind administration tools" - tristate - default n - depends ADK_DUMMY_BIND - select ADK_COMPILE_BIND - select ADK_PACKAGE_LIBBIND - help - dig, host, nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf, - named-checkzone, rndc, rndc-confgen - - http://www.isc.org/sw/bind/ - - Depends: libopenssl - config ADK_PACKAGE_BIND_RNDC prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)" tristate @@ -32,11 +17,8 @@ config ADK_PACKAGE_BIND_RNDC select ADK_PACKAGE_LIBBIND help rndc, rndc-confgen - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_CHECK prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)" tristate @@ -46,11 +28,8 @@ config ADK_PACKAGE_BIND_CHECK select ADK_PACKAGE_LIBBIND help named-checkconf, named-checkzone - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_DNSSEC prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)" tristate @@ -60,11 +39,8 @@ config ADK_PACKAGE_BIND_DNSSEC select ADK_PACKAGE_LIBBIND help dnssec-keygen, dnssec-signzone - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_HOST prompt "bind-host......................... A simple DNS client" tristate @@ -73,11 +49,9 @@ config ADK_PACKAGE_BIND_HOST select ADK_COMPILE_BIND select ADK_PACKAGE_LIBBIND help - host - + host utility. http://www.isc.org/sw/bind/ - Depends: libopenssl config ADK_PACKAGE_BIND_DIG prompt "bind-dig.......................... A DNS client" @@ -87,12 +61,9 @@ config ADK_PACKAGE_BIND_DIG select ADK_COMPILE_BIND select ADK_PACKAGE_LIBBIND help - dig - + dig utility. http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_CLIENT prompt "bind-client....................... A dynamic DNS client" @@ -103,11 +74,8 @@ config ADK_PACKAGE_BIND_CLIENT select ADK_PACKAGE_LIBBIND help A DNS dynamic client (nsupdate) - http://www.isc.org/sw/bind/ - Depends: libopenssl - config ADK_PACKAGE_BIND_SERVER prompt "bind-server....................... A DNS server" tristate @@ -117,12 +85,8 @@ config ADK_PACKAGE_BIND_SERVER select ADK_PACKAGE_LIBBIND help A DNS server (named) - http://www.isc.org/sw/bind/ - Depends: libopenssl - - config ADK_PACKAGE_LIBBIND prompt "libbind........................... Support library for the bind tools and dns server/client." tristate @@ -131,6 +95,3 @@ config ADK_PACKAGE_LIBBIND select ADK_COMPILE_BIND help http://www.isc.org/sw/bind/ - - Depends: libopenssl - |