To: vim-dev@vim.org
Subject: Patch 7.2.393
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.393
Problem: Mac: Can't build with different Xcode developer tools directory.
Solution: make "Developer" directory name configurable. (Rainer Muller)
Files: src/configure.in, src/auto/configure
*** ../vim-7.2.392/src/configure.in 2010-02-24 14:46:58.000000000 +0100
--- src/configure.in 2010-03-10 16:16:48.000000000 +0100
***************
*** 116,121 ****
--- 116,137 ----
MACARCH="$withval"; AC_MSG_RESULT($MACARCH),
MACARCH="current"; AC_MSG_RESULT(defaulting to $MACARCH))
+ AC_MSG_CHECKING(--with-developer-dir argument)
+ AC_ARG_WITH(developer-dir, [ --with-developer-dir=PATH use PATH as location for Xcode developer tools],
+ DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR),
+ DEVELOPER_DIR=""; AC_MSG_RESULT(not present))
+
+ if test "x$DEVELOPER_DIR" = "x"; then
+ AC_PATH_PROG(XCODE_SELECT, xcode-select)
+ if test "x$XCODE_SELECT" != "x"; then
+ AC_MSG_CHECKING(for developer dir using xcode-select)
+ DEVELOPER_DIR=`$XCODE_SELECT -print-path`
+ AC_MSG_RESULT([$DEVELOPER_DIR])
+ else
+ DEVELOPER_DIR=/Developer
+ fi
+ fi
+
if test "x$MACARCH" = "xboth"; then
AC_MSG_CHECKING(for 10.4 universal SDK)
dnl There is a terrible inconsistency (but we appear to get away with it):
***************
*** 127,133 ****
save_cppflags="$CPPFLAGS"
save_cflags="$CFLAGS"
save_ldflags="$LDFLAGS"
! CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
AC_TRY_LINK([ ], [ ],
AC_MSG_RESULT(found, will make universal binary),
--- 143,149 ----
save_cppflags="$CPPFLAGS"
save_cflags="$CFLAGS"
save_ldflags="$LDFLAGS"
! CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
AC_TRY_LINK([ ], [ ],
AC_MSG_RESULT(found, will make universal binary),
***************
*** 157,165 ****
dnl TODO: use -arch i386 on Intel machines
CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
if test "x$MACARCH" = "xboth"; then
! CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
else
! CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
fi
dnl If Carbon is found, assume we don't want X11
--- 173,181 ----
dnl TODO: use -arch i386 on Intel machines
CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
if test "x$MACARCH" = "xboth"; then
! CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
else
! CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
fi
dnl If Carbon is found, assume we don't want X11
***************
*** 3233,3239 ****
fi
fi
if test "x$MACARCH" = "xboth"; then
! LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
fi
dnl gcc 3.1 changed the meaning of -MM. The only solution appears to be to
--- 3249,3255 ----
fi
fi
if test "x$MACARCH" = "xboth"; then
! LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
fi
dnl gcc 3.1 changed the meaning of -MM. The only solution appears to be to
*** ../vim-7.2.392/src/auto/configure 2010-02-24 14:46:58.000000000 +0100
--- src/auto/configure 2010-03-10 16:19:47.000000000 +0100
***************
*** 718,723 ****
--- 718,724 ----
VIMNAME
OS_EXTRA_OBJ
OS_EXTRA_SRC
+ XCODE_SELECT
CPP_MM
STRIP
AWK
***************
*** 774,779 ****
--- 775,781 ----
enable_option_checking
enable_darwin
with_mac_arch
+ with_developer_dir
with_local_dir
with_vim_name
with_ex_name
***************
*** 1492,1497 ****
--- 1494,1500 ----
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-mac-arch=ARCH current, intel, ppc or both
+ --with-developer-dir=PATH use PATH as location for Xcode developer tools
--with-local-dir=PATH search PATH instead of /usr/local for local libraries.
--without-local-dir do not search /usr/local for local libraries.
--with-vim-name=NAME what to call the Vim executable
***************
*** 3833,3845 ****
fi
if test "x$MACARCH" = "xboth"; then
{ $as_echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5
$as_echo_n "checking for 10.4 universal SDK... " >&6; }
save_cppflags="$CPPFLAGS"
save_cflags="$CFLAGS"
save_ldflags="$LDFLAGS"
! CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
--- 3836,3913 ----
fi
+ { $as_echo "$as_me:$LINENO: checking --with-developer-dir argument" >&5
+ $as_echo_n "checking --with-developer-dir argument... " >&6; }
+
+ # Check whether --with-developer-dir was given.
+ if test "${with_developer_dir+set}" = set; then
+ withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5
+ $as_echo "$DEVELOPER_DIR" >&6; }
+ else
+ DEVELOPER_DIR=""; { $as_echo "$as_me:$LINENO: result: not present" >&5
+ $as_echo "not present" >&6; }
+ fi
+
+
+ if test "x$DEVELOPER_DIR" = "x"; then
+ # Extract the first word of "xcode-select", so it can be a program name with args.
+ set dummy xcode-select; ac_word=$2
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_path_XCODE_SELECT+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ case $XCODE_SELECT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XCODE_SELECT="$XCODE_SELECT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ ;;
+ esac
+ fi
+ XCODE_SELECT=$ac_cv_path_XCODE_SELECT
+ if test -n "$XCODE_SELECT"; then
+ { $as_echo "$as_me:$LINENO: result: $XCODE_SELECT" >&5
+ $as_echo "$XCODE_SELECT" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test "x$XCODE_SELECT" != "x"; then
+ { $as_echo "$as_me:$LINENO: checking for developer dir using xcode-select" >&5
+ $as_echo_n "checking for developer dir using xcode-select... " >&6; }
+ DEVELOPER_DIR=`$XCODE_SELECT -print-path`
+ { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5
+ $as_echo "$DEVELOPER_DIR" >&6; }
+ else
+ DEVELOPER_DIR=/Developer
+ fi
+ fi
+
if test "x$MACARCH" = "xboth"; then
{ $as_echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5
$as_echo_n "checking for 10.4 universal SDK... " >&6; }
save_cppflags="$CPPFLAGS"
save_cflags="$CFLAGS"
save_ldflags="$LDFLAGS"
! CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
***************
*** 3960,3968 ****
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
if test "x$MACARCH" = "xboth"; then
! CPPFLAGS="$CPPFLAGS -I/Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
else
! CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--- 4028,4036 ----
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp"
if test "x$MACARCH" = "xboth"; then
! CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
else
! CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
***************
*** 17319,17325 ****
fi
fi
if test "x$MACARCH" = "xboth"; then
! LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
fi
DEPEND_CFLAGS_FILTER=
--- 17387,17393 ----
fi
fi
if test "x$MACARCH" = "xboth"; then
! LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
fi
DEPEND_CFLAGS_FILTER=
*** ../vim-7.2.392/src/version.c 2010-03-10 16:11:57.000000000 +0100
--- src/version.c 2010-03-10 16:26:00.000000000 +0100
***************
*** 683,684 ****
--- 683,686 ----
{ /* Add new patch number below this line */
+ /**/
+ 393,
/**/
--
There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU,
Linux, etc, and those who know COBOL. It gets very difficult for me at
parties, not knowing which group to socialise with :-)
Sitaram Chamarty
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ download, build and distribute -- http://www.A-A-P.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///