diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-05-06 13:26:41 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-05-06 13:26:41 +0000 |
| commit | d7afed3753242ace4190f1d7500209b67045d7de (patch) | |
| tree | 906215bfd202594c349dc97729cabbedf4a9a1ae /src | |
| parent | 9fc8c24ef8e018603b80ebc061873a968b670dfe (diff) | |
| download | vim-git-d7afed3753242ace4190f1d7500209b67045d7de.tar.gz | |
updated for version 7.1a
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.in | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/configure.in b/src/configure.in index 0af26bdd1..715a4cf29 100644 --- a/src/configure.in +++ b/src/configure.in @@ -404,13 +404,21 @@ if test "$enable_mzschemeinterp" = "yes"; then fi fi + SCHEME_INC= if test "X$vi_cv_path_mzscheme_pfx" != "X"; then AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include) if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then AC_MSG_RESULT("yes") else AC_MSG_RESULT("no") - vi_cv_path_mzscheme_pfx= + AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/plt/include) + if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then + AC_MSG_RESULT("yes") + SCHEME_INC=/plt + else + AC_MSG_RESULT("no") + vi_cv_path_mzscheme_pfx= + fi fi fi @@ -428,8 +436,11 @@ if test "$enable_mzschemeinterp" = "yes"; then MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib" fi fi - MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \ - -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/collects\"'" + if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then + SCHEME_COLLECTS=lib/plt/ + fi + MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include${SCHEME_INC} \ + -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'" MZSCHEME_SRC="if_mzsch.c" MZSCHEME_OBJ="objects/if_mzsch.o" MZSCHEME_PRO="if_mzsch.pro" @@ -508,8 +519,8 @@ if test "$enable_perlinterp" = "yes"; then LDFLAGS=$ldflags_save if test $perl_ok = yes; then if test "X$perlcppflags" != "X"; then - dnl remove -pipe, it confuses cproto - PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'` + dnl remove -pipe and -Wxxx, it confuses cproto + PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[[^ ]]*//'` fi if test "X$perlldflags" != "X"; then LDFLAGS="$perlldflags $LDFLAGS" |