diff options
| author | Shawn Routhier <sar@isc.com> | 2015-04-15 20:32:54 +0000 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.com> | 2015-04-15 20:32:54 +0000 |
| commit | e6e72c5101df3e498afd1b8e980adc00b9d5b080 (patch) | |
| tree | bd7b976dc704567ff29e631cde7c447dc7b6e8cd /configure | |
| parent | da88d34bdd947b7b30b91219e1261d6e64a650c1 (diff) | |
| download | isc-dhcp-e6e72c5101df3e498afd1b8e980adc00b9d5b080.tar.gz | |
[master] Autotool update for 39019
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -6849,11 +6849,7 @@ $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 +ac_config_files="$ac_config_files Makefile bind/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" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure |