aboutsummaryrefslogtreecommitdiffhomepage
path: root/configure
diff options
context:
space:
mode:
authorGravatar pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-09-17 14:26:49 +0000
committerGravatar pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7>2012-09-17 14:26:49 +0000
commita6dac9962929d724c08c9a74a8e05de06469a1a0 (patch)
tree50b0390b38f18c27c2c171c1cbfd130200fa6289 /configure
parent26f21ad4387a2e9b9c16712859881fee5625f79b (diff)
MacOS integration uses lablgtkosx >= 1.1
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15814 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index f8ac8e99e..1f87c9dd1 100755
--- a/configure
+++ b/configure
@@ -647,11 +647,9 @@ else
else
echo "LablGtk2 found, native threads: native CoqIde will be available."
COQIDE=opt
- if [ "$nomacintegration_spec" = "no" ] && pkg-config --exists gtk-mac-integration;
+ if [ "$nomacintegration_spec" = "no" ] && lablgtkosxdir=$(ocamlfind query lablgtkosx 2> /dev/null);
then
- cflags=$cflags" `pkg-config --cflags gtk-mac-integration`"
- IDEARCHFLAGS='-ccopt "`pkg-config --libs gtk-mac-integration`"'
- IDEARCHFILE=ide/ide_mac_stubs.o
+ IDEARCHFLAGS=lablgtkosx.cmxa
IDEARCHDEF=QUARTZ
elif [ "$ARCH" = "win32" ];
then
@@ -673,6 +671,8 @@ case $COQIDE in
no) LABLGTKINCLUDES="";;
esac
+[ x$lablgtkosxdir = x ] || LABLGTKINCLUDES="$LABLGTKINCLUDES -I $lablgtkosxdir"
+
# strip command
case $ARCH in