diff options
| author | letouzey | 2011-04-21 16:12:57 +0000 |
|---|---|---|
| committer | letouzey | 2011-04-21 16:12:57 +0000 |
| commit | e1d0e7cd11cfe63f4741274f6d94f07887f32ffe (patch) | |
| tree | 1011840a8fc280819449d00ee11500b7bb6ab727 /configure | |
| parent | c9febd2450c40dbc46182662ccdc1567050d0222 (diff) | |
Coqide: a special kill function for win32
This is implemented as a C external launching the TerminateProcess
of the Win32 API. This should be considered as quite experimental
(cf. the way we handle pid in the comment of ide_win32_stubs.c).
I don't know how to emulate an interrupt (Ctrl-C), for now the two
button "Restart" and "Interrupt" have the same semantics on win32
(kill the subprocess and start at top).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14044 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 31 |
1 files changed, 18 insertions, 13 deletions
@@ -597,6 +597,10 @@ esac # lablgtk2 and CoqIDE +IDEARCHFLAGS= +IDEARCHFILE= +IDEARCHDEF= + # -byte-only should imply -coqide byte, unless the user decides otherwise if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then @@ -639,16 +643,17 @@ else echo "LablGtk2 found, native threads: native CoqIde will be available." COQIDE=opt if [ "$nomacintegration_spec" = "no" ] && pkg-config --exists ige-mac-integration; - then + then cflags=$cflags" `pkg-config --cflags ige-mac-integration`" - MACIGEFLAGS='-ccopt "`pkg-config --libs ige-mac-integration`"' - MACIGEFILE=ide/ide_mac_stubs.o - MACIGEP4=-DMacInt - else - MACIGEFLAGS="" - MACIGEFILE="" - MACIGEP4="" - fi + IDEARCHFLAGS='-ccopt "`pkg-config --libs ige-mac-integration`"' + IDEARCHFILE=ide/ide_mac_stubs.o + IDEARCHDEF=-DMacInt + elif [ "$ARCH" = "win32" ]; + then + IDEARCHFLAGS= + IDEARCHFILE=ide/ide_win32_stubs.o + IDEARCHDEF=-DWin32 + fi fi fi @@ -876,7 +881,7 @@ fi if test "$COQIDE" != "no"; then echo " Lablgtk2 library in : $LABLGTKLIB" fi -if test "$MACIGEFILE" != ""; then +if test "$IDEARCHDEF" = "-DMacInt"; then echo " Mac OS integration is on" fi if test "$with_doc" = "all"; then @@ -1108,9 +1113,9 @@ sed -e "s|LOCALINSTALLATION|$local|" \ -e "s|RANLIBEXEC|$ranlib_exec|" \ -e "s|STRIPCOMMAND|$STRIPCOMMAND|" \ -e "s|COQIDEOPT|$COQIDE|" \ - -e "s|MACIGEFLAGS|$MACIGEFLAGS|" \ - -e "s|MACIGEFILE|$MACIGEFILE|" \ - -e "s|MACIGEP4|$MACIGEP4|" \ + -e "s|IDEARCHFLAGS|$IDEARCHFLAGS|" \ + -e "s|IDEARCHFILE|$IDEARCHFILE|" \ + -e "s|IDEARCHDEF|$IDEARCHDEF|" \ -e "s|CHECKEDOUTSOURCETREE|$checkedout|" \ -e "s|WITHDOCOPT|$with_doc|" \ -e "s|HASNATIVEDYNLINK|$NATDYNLINKFLAG|" \ |