home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 6.2.140 < prev    next >
Encoding:
Internet Message Format  |  2003-10-28  |  10.5 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 6.2.140
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=ISO-8859-1
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 6.2.140 (after 6.2.121)
  11. Problem:    Mac: Compiling with Python and Perl doesn't work.
  12. Solution:   Adjust the configure check for Python to use "-framework Python"
  13.         for Python 2.3 on Mac OS/X.
  14.         Move "-ldl" after "DynaLoader.a" in the link command.
  15.         Change "perllibs" to "PERL_LIBS".
  16. Files:        src/auto/configure, src/configure.in, src/config.mk.in
  17.  
  18.  
  19. *** ../vim-6.2.139/src/auto/configure    Thu Oct 23 14:10:16 2003
  20. --- src/auto/configure    Wed Oct 29 13:31:11 2003
  21. ***************
  22. *** 1179,1185 ****
  23.     MACOSX=yes
  24.     OS_EXTRA_SCR="os_macosx.c"; 
  25.     OS_EXTRA_OBJ="objects/os_macosx.o"
  26. !   CFLAGS="$CFLAGS -DMACOS_X_UNIX"
  27.   
  28.         ac_safe=`echo "Carbon/Carbon.h" | sed 'y%./+-%__p_%'`
  29.   echo $ac_n "checking for Carbon/Carbon.h""... $ac_c" 1>&6
  30. --- 1179,1185 ----
  31.     MACOSX=yes
  32.     OS_EXTRA_SCR="os_macosx.c"; 
  33.     OS_EXTRA_OBJ="objects/os_macosx.o"
  34. !   CFLAGS="$CFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
  35.   
  36.         ac_safe=`echo "Carbon/Carbon.h" | sed 'y%./+-%__p_%'`
  37.   echo $ac_n "checking for Carbon/Carbon.h""... $ac_c" 1>&6
  38. ***************
  39. *** 1547,1553 ****
  40.         if test "X$perlcppflags" != "X"; then
  41.       PERL_CFLAGS="$perlcppflags"
  42.         fi
  43. !             perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
  44.           sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
  45.               -e 's/-bE:perl.exp//' -e 's/-lc //'`
  46.         
  47. --- 1547,1553 ----
  48.         if test "X$perlcppflags" != "X"; then
  49.       PERL_CFLAGS="$perlcppflags"
  50.         fi
  51. !             PERL_LIBS=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
  52.           sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
  53.               -e 's/-bE:perl.exp//' -e 's/-lc //'`
  54.         
  55. ***************
  56. *** 1587,1593 ****
  57.         PERL_DIR=$dir
  58.         PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE
  59.         PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a
  60. !       PERL_LIBS=-lperl -L$darwindir/CORE
  61.       fi
  62.     fi
  63.   fi
  64. --- 1587,1593 ----
  65.         PERL_DIR=$dir
  66.         PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE
  67.         PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a
  68. !       PERL_LIBS=-L$darwindir/CORE -lperl
  69.       fi
  70.     fi
  71.   fi
  72. ***************
  73. *** 1748,1760 ****
  74.   eof
  75.                   eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
  76.           rm -f ${tmp_mkf}
  77. !         if test "${vi_cv_var_python_version}" = "1.4"; then
  78. !         vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
  79.           else
  80. !         vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  81.           fi
  82. -         vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
  83. -                 vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  84.       
  85.   fi
  86.   
  87. --- 1748,1765 ----
  88.   eof
  89.                   eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
  90.           rm -f ${tmp_mkf}
  91. !         if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
  92. !         "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
  93. !           vi_cv_path_python_plibs="-framework Python"
  94.           else
  95. !           if test "${vi_cv_var_python_version}" = "1.4"; then
  96. !           vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
  97. !           else
  98. !           vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  99. !           fi
  100. !           vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
  101. !                     vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  102.           fi
  103.       
  104.   fi
  105.   
  106. ***************
  107. *** 8008,8013 ****
  108. --- 8016,8028 ----
  109.   done
  110.   
  111.   
  112. + if test "x$MACOSX" = "xyes" -a -n "$PERL"; then
  113. +     if echo $LIBS | grep -e '-ldl' >/dev/null; then
  114. +     LIBS=`echo $LIBS | sed s/-ldl//`
  115. +     PERL_LIBS="$PERL_LIBS -ldl"
  116. +   fi
  117. + fi
  118. + 
  119.   trap '' 1 2 15
  120.   cat > confcache <<\EOF
  121.   # This file is a shell script that caches the results of configure
  122. ***************
  123. *** 8158,8164 ****
  124.   s%@compiledby@%$compiledby%g
  125.   s%@vi_cv_path_perl@%$vi_cv_path_perl%g
  126.   s%@vi_cv_perllib@%$vi_cv_perllib%g
  127. ! s%@perllibs@%$perllibs%g
  128.   s%@shrpenv@%$shrpenv%g
  129.   s%@PERL_SRC@%$PERL_SRC%g
  130.   s%@PERL_OBJ@%$PERL_OBJ%g
  131. --- 8173,8179 ----
  132.   s%@compiledby@%$compiledby%g
  133.   s%@vi_cv_path_perl@%$vi_cv_path_perl%g
  134.   s%@vi_cv_perllib@%$vi_cv_perllib%g
  135. ! s%@PERL_LIBS@%$PERL_LIBS%g
  136.   s%@shrpenv@%$shrpenv%g
  137.   s%@PERL_SRC@%$PERL_SRC%g
  138.   s%@PERL_OBJ@%$PERL_OBJ%g
  139. *** ../vim-6.2.139/src/configure.in    Fri Oct 17 12:01:21 2003
  140. --- src/configure.in    Wed Oct 29 13:30:12 2003
  141. ***************
  142. *** 85,91 ****
  143.     MACOSX=yes
  144.     OS_EXTRA_SCR="os_macosx.c"; 
  145.     OS_EXTRA_OBJ="objects/os_macosx.o"
  146. !   CFLAGS="$CFLAGS -DMACOS_X_UNIX"
  147.   
  148.     dnl If Carbon is found, assume we don't want X11
  149.     dnl unless it was specifically asked for (--with-x)
  150. --- 85,91 ----
  151.     MACOSX=yes
  152.     OS_EXTRA_SCR="os_macosx.c"; 
  153.     OS_EXTRA_OBJ="objects/os_macosx.o"
  154. !   CFLAGS="$CFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
  155.   
  156.     dnl If Carbon is found, assume we don't want X11
  157.     dnl unless it was specifically asked for (--with-x)
  158. ***************
  159. *** 298,307 ****
  160.       PERL_CFLAGS="$perlcppflags"
  161.         fi
  162.         dnl Remove "-lc", it breaks on FreeBSD when using "-pthread".
  163. !       perllibs=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
  164.           sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
  165.               -e 's/-bE:perl.exp//' -e 's/-lc //'`
  166. !       AC_SUBST(perllibs)
  167.         dnl Don't add perl lib to $LIBS: if it's not in LD_LIBRARY_PATH
  168.         dnl a test in configure may fail because of that.
  169.         perlldflags=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed \
  170. --- 298,307 ----
  171.       PERL_CFLAGS="$perlcppflags"
  172.         fi
  173.         dnl Remove "-lc", it breaks on FreeBSD when using "-pthread".
  174. !       PERL_LIBS=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed -e 'ldopts' | \
  175.           sed -e '/Warning/d' -e '/Note (probably harmless)/d' \
  176.               -e 's/-bE:perl.exp//' -e 's/-lc //'`
  177. !       AC_SUBST(PERL_LIBS)
  178.         dnl Don't add perl lib to $LIBS: if it's not in LD_LIBRARY_PATH
  179.         dnl a test in configure may fail because of that.
  180.         perlldflags=`cd $srcdir; $vi_cv_path_perl -MExtUtils::Embed \
  181. ***************
  182. *** 339,345 ****
  183.         PERL_DIR=$dir
  184.         PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE
  185.         PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a
  186. !       PERL_LIBS=-lperl -L$darwindir/CORE
  187.       fi
  188.     fi
  189.   fi
  190. --- 339,345 ----
  191.         PERL_DIR=$dir
  192.         PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE
  193.         PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a
  194. !       PERL_LIBS=-L$darwindir/CORE -lperl
  195.       fi
  196.     fi
  197.   fi
  198. ***************
  199. *** 432,445 ****
  200.           dnl -- delete the lines from make about Entering/Leaving directory
  201.           eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
  202.           rm -f ${tmp_mkf}
  203. !         if test "${vi_cv_var_python_version}" = "1.4"; then
  204. !         vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
  205.           else
  206. !         vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  207.           fi
  208. -         vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
  209. -         dnl remove -ltermcap, it can conflict with an earlier -lncurses
  210. -         vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  211.       ])
  212.   
  213.       PYTHON_LIBS="${vi_cv_path_python_plibs}"
  214. --- 432,450 ----
  215.           dnl -- delete the lines from make about Entering/Leaving directory
  216.           eval "`cd ${PYTHON_CONFDIR} && make -f ${tmp_mkf} __ | sed '/ directory /d'`"
  217.           rm -f ${tmp_mkf}
  218. !         if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \
  219. !         "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
  220. !           vi_cv_path_python_plibs="-framework Python"
  221.           else
  222. !           if test "${vi_cv_var_python_version}" = "1.4"; then
  223. !           vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a"
  224. !           else
  225. !           vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
  226. !           fi
  227. !           vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_MODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
  228. !           dnl remove -ltermcap, it can conflict with an earlier -lncurses
  229. !           vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
  230.           fi
  231.       ])
  232.   
  233.       PYTHON_LIBS="${vi_cv_path_python_plibs}"
  234. ***************
  235. *** 2510,2515 ****
  236. --- 2515,2528 ----
  237.             LIBS=$olibs))
  238.   fi
  239.   AC_CHECK_HEADERS(setjmp.h)
  240. + 
  241. + if test "x$MACOSX" = "xyes" -a -n "$PERL"; then
  242. +   dnl -ldl must come after DynaLoader.a
  243. +   if echo $LIBS | grep -e '-ldl' >/dev/null; then
  244. +     LIBS=`echo $LIBS | sed s/-ldl//`
  245. +     PERL_LIBS="$PERL_LIBS -ldl"
  246. +   fi
  247. + fi
  248.   
  249.   dnl write output files
  250.   AC_OUTPUT(auto/config.mk:config.mk.in)
  251. *** ../vim-6.2.139/src/config.mk.in    Mon Oct 13 22:21:06 2003
  252. --- src/config.mk.in    Wed Oct 29 13:30:46 2003
  253. ***************
  254. *** 37,43 ****
  255.   
  256.   PERL        = @vi_cv_path_perl@
  257.   PERLLIB        = @vi_cv_perllib@
  258. ! PERL_LIBS    = @perllibs@
  259.   SHRPENV        = @shrpenv@
  260.   PERL_SRC    = @PERL_SRC@
  261.   PERL_OBJ    = @PERL_OBJ@
  262. --- 37,43 ----
  263.   
  264.   PERL        = @vi_cv_path_perl@
  265.   PERLLIB        = @vi_cv_perllib@
  266. ! PERL_LIBS    = @PERL_LIBS@
  267.   SHRPENV        = @shrpenv@
  268.   PERL_SRC    = @PERL_SRC@
  269.   PERL_OBJ    = @PERL_OBJ@
  270. *** ../vim-6.2.139/src/version.c    Wed Oct 29 14:45:27 2003
  271. --- src/version.c    Wed Oct 29 14:47:22 2003
  272. ***************
  273. *** 639,640 ****
  274. --- 639,642 ----
  275.   {   /* Add new patch number below this line */
  276. + /**/
  277. +     140,
  278.   /**/
  279.  
  280. -- 
  281. TIM: To the north there lies a cave,  the cave of Caerbannog, wherein, carved
  282.      in mystic runes, upon the very living rock, the last words of Olfin
  283.      Bedwere of Rheged make plain the last resting place of the most Holy
  284.      Grail.
  285.                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  286.  
  287.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  288. ///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
  289. \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  290.  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///
  291.