merge of 3.8 broke configure (unresolved conflicts)

[PHHargrove]

It appears that configure at 7e63d1b contains unresolved merge conflicts:

$ git grep -e '^<<<<<<' -e '^>>>>>>'
configure:<<<<<<< HEAD
configure:>>>>>>> merge_38
configure:<<<<<<< HEAD
configure:>>>>>>> merge_38
configure:<<<<<<< HEAD
configure:>>>>>>> merge_38

As a result, when using configure rather than cmake, I see

configure: line 6088: syntax error at line 6093: `<<' unexpected

-Paul

[nenadv]

I re-gen the configure file and retried. However, on FC23 I am getting an error that 'ctype' ocaml package is not present (couldn't find which package contains it). I was able to configure it with --disable-bindings switch.

[PHHargrove]

Nenad,

I will keep watch on how the configure-based nightly builds go over this week.
I will add --disable-bindings if necessary.

-Paul

[nenadv]

I think something is wrong with configure logic. cmake just disables bindings if prerequisite are not there. This has been reported on the Mac in December of last year - http://lists.llvm.org/pipermail/lldb-dev/2015-December/009186.html, and one of the responses:

Are the Xcode scripts using the llvm configure build?  If so they will need
to be changed to the CMake build sooner or later, because the configure
build is going away in the near future.