Mercurial > vim
comparison src/configure.in @ 856:8cd729851562 v7.0g
updated for version 7.0g
author | vimboss |
---|---|
date | Sun, 30 Apr 2006 18:54:39 +0000 |
parents | 1f3b1021f002 |
children | bc620d6bdf06 |
comparison
equal
deleted
inserted
replaced
855:d2a4f08396fe | 856:8cd729851562 |
---|---|
133 CPPFLAGS="$CPPFLAGS -arch i386" | 133 CPPFLAGS="$CPPFLAGS -arch i386" |
134 LDFLAGS="$save_ldflags -arch i386" | 134 LDFLAGS="$save_ldflags -arch i386" |
135 AC_TRY_LINK([ ], [ ], | 135 AC_TRY_LINK([ ], [ ], |
136 AC_MSG_RESULT(yes); MACARCH="intel", | 136 AC_MSG_RESULT(yes); MACARCH="intel", |
137 AC_MSG_RESULT(no, using PowerPC) | 137 AC_MSG_RESULT(no, using PowerPC) |
138 MACARCH="ppc" | 138 MACARCH="ppc" |
139 CPPFLAGS="$save_cppflags -arch ppc" | 139 CPPFLAGS="$save_cppflags -arch ppc" |
140 LDFLAGS="$save_ldflags -arch ppc")) | 140 LDFLAGS="$save_ldflags -arch ppc")) |
141 elif test "x$MACARCH" = "xintel"; then | 141 elif test "x$MACARCH" = "xintel"; then |
142 CPPFLAGS="$CPPFLAGS -arch intel" | 142 CPPFLAGS="$CPPFLAGS -arch intel" |
143 LDFLAGS="$LDFLAGS -arch intel" | 143 LDFLAGS="$LDFLAGS -arch intel" |
370 dnl -- find the mzscheme executable | 370 dnl -- find the mzscheme executable |
371 AC_SUBST(vi_cv_path_mzscheme) | 371 AC_SUBST(vi_cv_path_mzscheme) |
372 | 372 |
373 AC_MSG_CHECKING(--with-plthome argument) | 373 AC_MSG_CHECKING(--with-plthome argument) |
374 AC_ARG_WITH(plthome, | 374 AC_ARG_WITH(plthome, |
375 [ --with-plthome=PLTHOME Use PLTHOME.], | 375 [ --with-plthome=PLTHOME Use PLTHOME.], |
376 with_plthome="$withval"; AC_MSG_RESULT($with_plthome), | 376 with_plthome="$withval"; AC_MSG_RESULT($with_plthome), |
377 with_plthome="";AC_MSG_RESULT("no")) | 377 with_plthome="";AC_MSG_RESULT("no")) |
378 | 378 |
379 if test "X$with_plthome" != "X"; then | 379 if test "X$with_plthome" != "X"; then |
380 vi_cv_path_mzscheme_pfx="$with_plthome" | 380 vi_cv_path_mzscheme_pfx="$with_plthome" |
381 else | 381 else |
382 AC_MSG_CHECKING(PLTHOME environment var) | 382 AC_MSG_CHECKING(PLTHOME environment var) |
383 if test "X$PLTHOME" != "X"; then | 383 if test "X$PLTHOME" != "X"; then |
384 AC_MSG_RESULT("$PLTHOME") | 384 AC_MSG_RESULT("$PLTHOME") |
385 vi_cv_path_mzscheme_pfx="$PLTHOME" | 385 vi_cv_path_mzscheme_pfx="$PLTHOME" |
386 else | 386 else |
387 AC_MSG_RESULT("not set") | 387 AC_MSG_RESULT("not set") |
388 dnl -- try to find MzScheme executable | 388 dnl -- try to find MzScheme executable |
389 AC_PATH_PROG(vi_cv_path_mzscheme, mzscheme) | 389 AC_PATH_PROG(vi_cv_path_mzscheme, mzscheme) |
390 | 390 |
391 dnl resolve symbolic link, the executable is often elsewhere and there | 391 dnl resolve symbolic link, the executable is often elsewhere and there |
392 dnl are no links for the include files. | 392 dnl are no links for the include files. |
393 if test "X$vi_cv_path_mzscheme" != "X"; then | 393 if test "X$vi_cv_path_mzscheme" != "X"; then |
394 lsout=`ls -l $vi_cv_path_mzscheme` | 394 lsout=`ls -l $vi_cv_path_mzscheme` |
395 if echo "$lsout" | grep -e '->' >/dev/null 2>/dev/null; then | 395 if echo "$lsout" | grep -e '->' >/dev/null 2>/dev/null; then |
396 vi_cv_path_mzscheme=`echo "$lsout" | sed 's/.*-> \(.*\)/\1/'` | 396 vi_cv_path_mzscheme=`echo "$lsout" | sed 's/.*-> \(.*\)/\1/'` |
397 fi | 397 fi |
398 fi | 398 fi |
399 | 399 |
400 if test "X$vi_cv_path_mzscheme" != "X"; then | 400 if test "X$vi_cv_path_mzscheme" != "X"; then |
401 dnl -- find where MzScheme thinks it was installed | 401 dnl -- find where MzScheme thinks it was installed |
402 AC_CACHE_CHECK(MzScheme install prefix,vi_cv_path_mzscheme_pfx, | 402 AC_CACHE_CHECK(MzScheme install prefix,vi_cv_path_mzscheme_pfx, |
403 [ vi_cv_path_mzscheme_pfx=` | 403 [ vi_cv_path_mzscheme_pfx=` |
404 ${vi_cv_path_mzscheme} -evm \ | 404 ${vi_cv_path_mzscheme} -evm \ |
405 "(display (simplify-path \ | 405 "(display (simplify-path \ |
406 (build-path (call-with-values \ | 406 (build-path (call-with-values \ |
407 (lambda () (split-path (find-system-path (quote exec-file)))) \ | 407 (lambda () (split-path (find-system-path (quote exec-file)))) \ |
408 (lambda (base name must-be-dir?) base)) (quote up))))"` ]) | 408 (lambda (base name must-be-dir?) base)) (quote up))))"` ]) |
409 dnl Remove a trailing slash. | 409 dnl Remove a trailing slash. |
410 vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'` | 410 vi_cv_path_mzscheme_pfx=`echo "$vi_cv_path_mzscheme_pfx" | sed 's+/$++'` |
411 fi | 411 fi |
412 fi | 412 fi |
413 fi | 413 fi |
414 | 414 |
415 if test "X$vi_cv_path_mzscheme_pfx" != "X"; then | 415 if test "X$vi_cv_path_mzscheme_pfx" != "X"; then |
416 AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include) | 416 AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include) |
428 else | 428 else |
429 MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzgc -lmzscheme" | 429 MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzgc -lmzscheme" |
430 if test "$GCC" = yes; then | 430 if test "$GCC" = yes; then |
431 dnl Make Vim remember the path to the library. For when it's not in | 431 dnl Make Vim remember the path to the library. For when it's not in |
432 dnl $LD_LIBRARY_PATH. | 432 dnl $LD_LIBRARY_PATH. |
433 MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" | 433 MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" |
434 elif test "`(uname) 2>/dev/null`" = SunOS && | 434 elif test "`(uname) 2>/dev/null`" = SunOS && |
435 uname -r | grep '^5' >/dev/null; then | 435 uname -r | grep '^5' >/dev/null; then |
436 MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib" | 436 MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib" |
437 fi | 437 fi |
438 fi | 438 fi |
1484 if $PKG_CONFIG --exists libgnomeui-2.0; then | 1484 if $PKG_CONFIG --exists libgnomeui-2.0; then |
1485 AC_MSG_RESULT(yes) | 1485 AC_MSG_RESULT(yes) |
1486 GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` | 1486 GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` |
1487 GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` | 1487 GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` |
1488 GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` | 1488 GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` |
1489 | 1489 |
1490 dnl On FreeBSD we need -pthread but pkg-config doesn't include it. | 1490 dnl On FreeBSD we need -pthread but pkg-config doesn't include it. |
1491 dnl This might not be the right way but it works for me... | 1491 dnl This might not be the right way but it works for me... |
1492 AC_MSG_CHECKING(for FreeBSD) | 1492 AC_MSG_CHECKING(for FreeBSD) |
1493 if test "`(uname) 2>/dev/null`" = FreeBSD; then | 1493 if test "`(uname) 2>/dev/null`" = FreeBSD; then |
1494 AC_MSG_RESULT(yes, adding -pthread) | 1494 AC_MSG_RESULT(yes, adding -pthread) |
1495 GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE" | 1495 GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE" |
1496 GNOME_LIBS="$GNOME_LIBS -pthread" | 1496 GNOME_LIBS="$GNOME_LIBS -pthread" |
1497 else | 1497 else |
1498 AC_MSG_RESULT(no) | 1498 AC_MSG_RESULT(no) |
1499 fi | 1499 fi |
1500 $1 | 1500 $1 |