diff options
| author | Shawn Routhier <sar@isc.org> | 2015-04-15 13:28:44 -0700 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2015-04-15 13:28:44 -0700 |
| commit | da88d34bdd947b7b30b91219e1261d6e64a650c1 (patch) | |
| tree | dcb66a4ca27db32379e676dd54aab02b9095e9ae /configure | |
| parent | 1c0b7d66b67f85c96f62d94896ad6403fffc79dc (diff) | |
| download | isc-dhcp-da88d34bdd947b7b30b91219e1261d6e64a650c1.tar.gz | |
[master] Remove dst directory as it was replaced in 4.2.0 by Bind
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -6849,7 +6849,11 @@ $as_echo "#define FLEXIBLE_ARRAY_MEMBER /**/" >>confdefs.h fi +<<<<<<< HEAD ac_config_files="$ac_config_files Makefile bind/Makefile client/Makefile client/tests/Makefile common/Makefile common/tests/Makefile dhcpctl/Makefile dst/Makefile includes/Makefile omapip/Makefile relay/Makefile server/Makefile tests/Makefile tests/unittest.sh server/tests/Makefile doc/devel/doxyfile" +======= +ac_config_files="$ac_config_files Makefile client/Makefile client/tests/Makefile common/Makefile common/tests/Makefile dhcpctl/Makefile includes/Makefile omapip/Makefile relay/Makefile server/Makefile tests/Makefile tests/unittest.sh server/tests/Makefile doc/devel/doxyfile" +>>>>>>> rt39019 cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7598,7 +7602,6 @@ do "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;; "common/tests/Makefile") CONFIG_FILES="$CONFIG_FILES common/tests/Makefile" ;; "dhcpctl/Makefile") CONFIG_FILES="$CONFIG_FILES dhcpctl/Makefile" ;; - "dst/Makefile") CONFIG_FILES="$CONFIG_FILES dst/Makefile" ;; "includes/Makefile") CONFIG_FILES="$CONFIG_FILES includes/Makefile" ;; "omapip/Makefile") CONFIG_FILES="$CONFIG_FILES omapip/Makefile" ;; "relay/Makefile") CONFIG_FILES="$CONFIG_FILES relay/Makefile" ;; |