Mercurial > vim

comparison src/configure.in @ 6651:7026d6f3367f v7.4.650

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.650 Problem: Configure check may fail because the dl library is not used. Solution: Put "-ldl" in LIBS rather than LDFLAGS. (Oazki Kiichi)
author Bram Moolenaar <bram@vim.org>
date Thu, 05 Mar 2015 16:47:20 +0100
parents 3421b24e419c
children 692bc2c52002
comparison
equal deleted inserted replaced
6650:e68ac2610381 6651:7026d6f3367f
1449 AC_DEFINE(DYNAMIC_PYTHON) 1449 AC_DEFINE(DYNAMIC_PYTHON)
1450 AC_DEFINE(DYNAMIC_PYTHON3) 1450 AC_DEFINE(DYNAMIC_PYTHON3)
1451 AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python) 1451 AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python)
1452 cflags_save=$CFLAGS 1452 cflags_save=$CFLAGS
1453 CFLAGS="$CFLAGS $PYTHON_CFLAGS" 1453 CFLAGS="$CFLAGS $PYTHON_CFLAGS"
1454 ldflags_save=$LDFLAGS 1454 libs_save=$LIBS
1455 dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) 1455 dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
1456 LDFLAGS="-ldl $LDFLAGS" 1456 LIBS="-ldl $LIBS"
1457 AC_RUN_IFELSE([AC_LANG_SOURCE([ 1457 AC_RUN_IFELSE([AC_LANG_SOURCE([
1458 #include <dlfcn.h> 1458 #include <dlfcn.h>
1459 /* If this program fails, then RTLD_GLOBAL is needed. 1459 /* If this program fails, then RTLD_GLOBAL is needed.
1460 * RTLD_GLOBAL will be used and then it is not possible to 1460 * RTLD_GLOBAL will be used and then it is not possible to
1461 * have both python versions enabled in the same vim instance. 1461 * have both python versions enabled in the same vim instance.
1489 return !not_needed; 1489 return !not_needed;
1490 }])], 1490 }])],
1491 [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)]) 1491 [AC_MSG_RESULT(yes);AC_DEFINE(PY_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
1492 1492
1493 CFLAGS=$cflags_save 1493 CFLAGS=$cflags_save
1494 LDFLAGS=$ldflags_save 1494 LIBS=$libs_save
1495 1495
1496 AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3) 1496 AC_MSG_CHECKING(whether we can do without RTLD_GLOBAL for Python3)
1497 cflags_save=$CFLAGS 1497 cflags_save=$CFLAGS
1498 CFLAGS="$CFLAGS $PYTHON3_CFLAGS" 1498 CFLAGS="$CFLAGS $PYTHON3_CFLAGS"
1499 ldflags_save=$LDFLAGS 1499 libs_save=$LIBS
1500 dnl -ldl must go first to make this work on Archlinux (Roland Puntaier) 1500 dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
1501 LDFLAGS="-ldl $LDFLAGS" 1501 LIBS="-ldl $LIBS"
1502 AC_RUN_IFELSE([AC_LANG_SOURCE([ 1502 AC_RUN_IFELSE([AC_LANG_SOURCE([
1503 #include <dlfcn.h> 1503 #include <dlfcn.h>
1504 #include <wchar.h> 1504 #include <wchar.h>
1505 /* If this program fails, then RTLD_GLOBAL is needed. 1505 /* If this program fails, then RTLD_GLOBAL is needed.
1506 * RTLD_GLOBAL will be used and then it is not possible to 1506 * RTLD_GLOBAL will be used and then it is not possible to
1535 return !not_needed; 1535 return !not_needed;
1536 }])], 1536 }])],
1537 [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)]) 1537 [AC_MSG_RESULT(yes);AC_DEFINE(PY3_NO_RTLD_GLOBAL)], [AC_MSG_RESULT(no)])
1538 1538
1539 CFLAGS=$cflags_save 1539 CFLAGS=$cflags_save
1540 LDFLAGS=$ldflags_save 1540 LIBS=$libs_save
1541 1541
1542 PYTHON_SRC="if_python.c" 1542 PYTHON_SRC="if_python.c"
1543 PYTHON_OBJ="objects/if_python.o" 1543 PYTHON_OBJ="objects/if_python.o"
1544 PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\"" 1544 PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
1545 PYTHON_LIBS= 1545 PYTHON_LIBS=