diff options
| author | Rob Austein <sra@hactrn.net> | 2011-09-15 00:04:23 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-09-15 00:04:23 +0000 |
| commit | 0c4a98c56785c2f4a6e4fba3941083fc466da893 (patch) | |
| tree | 4a188735b9d63422cf8573f1efbc5ec5b8e15162 /configure | |
| parent | bb6769c8315a193d7940837606951f1c2942e095 (diff) | |
Merge rcynic-ng/ back into rcynic/. Used svn merge --ignore-ancestry
to minimize problems for people mirroring the repository.
svn path=/configure; revision=3985
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -4266,7 +4266,7 @@ test $build_django = yes && RPKID_SUBDIRS="$RPKID_SUBDIRS portal-gui" -ac_config_files="$ac_config_files Makefile rcynic/Makefile rcynic/static-rsync/Makefile rcynic-ng/Makefile rcynic-ng/static-rsync/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/scan_roas/Makefile utils/uri/Makefile" +ac_config_files="$ac_config_files Makefile rcynic/Makefile rcynic/static-rsync/Makefile utils/Makefile utils/find_roa/Makefile utils/hashdir/Makefile utils/print_rpki_manifest/Makefile utils/print_roa/Makefile utils/scan_roas/Makefile utils/uri/Makefile" case $host_os in @@ -5135,8 +5135,6 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "rcynic/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/Makefile" ;; "rcynic/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic/static-rsync/Makefile" ;; - "rcynic-ng/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic-ng/Makefile" ;; - "rcynic-ng/static-rsync/Makefile") CONFIG_FILES="$CONFIG_FILES rcynic-ng/static-rsync/Makefile" ;; "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; "utils/find_roa/Makefile") CONFIG_FILES="$CONFIG_FILES utils/find_roa/Makefile" ;; "utils/hashdir/Makefile") CONFIG_FILES="$CONFIG_FILES utils/hashdir/Makefile" ;; |