comparison src/auto/configure @ 1668:0b796e045c42 v7.2b.000

updated for version 7.2b-000
author vimboss
date Sun, 13 Jul 2008 17:41:49 +0000
parents 68f005107052
children a881e15f44d8
comparison
equal deleted inserted replaced
1667:131dbd3d2a4b 1668:0b796e045c42
770 ac_subst_files='' 770 ac_subst_files=''
771 ac_user_opts=' 771 ac_user_opts='
772 enable_option_checking 772 enable_option_checking
773 enable_darwin 773 enable_darwin
774 with_mac_arch 774 with_mac_arch
775 with_local_dir
775 with_vim_name 776 with_vim_name
776 with_ex_name 777 with_ex_name
777 with_view_name 778 with_view_name
778 with_global_runtime 779 with_global_runtime
779 with_modified_by 780 with_modified_by
1486 1487
1487 Optional Packages: 1488 Optional Packages:
1488 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 1489 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1489 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 1490 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1490 --with-mac-arch=ARCH current, intel, ppc or both 1491 --with-mac-arch=ARCH current, intel, ppc or both
1492 --with-local-dir=PATH search PATH instead of /usr/local for local libraries.
1493 --without-local-dir do not search /usr/local for local libraries.
1491 --with-vim-name=NAME what to call the Vim executable 1494 --with-vim-name=NAME what to call the Vim executable
1492 --with-ex-name=NAME what to call the Ex executable 1495 --with-ex-name=NAME what to call the Ex executable
1493 --with-view-name=NAME what to call the View executable 1496 --with-view-name=NAME what to call the View executable
1494 --with-global-runtime=DIR global runtime directory in 'runtimepath' 1497 --with-global-runtime=DIR global runtime directory in 'runtimepath'
1495 --with-modified-by=NAME name of who modified a release version 1498 --with-modified-by=NAME name of who modified a release version
4174 4177
4175 4178
4176 4179
4177 4180
4178 if test "$cross_compiling" = no; then 4181 if test "$cross_compiling" = no; then
4182 { $as_echo "$as_me:$LINENO: checking --with-local-dir argument" >&5
4183 $as_echo_n "checking --with-local-dir argument... " >&6; }
4179 have_local_include='' 4184 have_local_include=''
4180 have_local_lib='' 4185 have_local_lib=''
4181 if test "$GCC" = yes; then 4186
4187 # Check whether --with-local-dir was given.
4188 if test "${with_local_dir+set}" = set; then
4189 withval=$with_local_dir;
4190 local_dir="$withval"
4191 case "$withval" in
4192 */*) ;;
4193 no)
4194 # avoid adding local dir to LDFLAGS and CPPFLAGS
4195 have_local_dir=yes
4196 have_local_lib=yes
4197 ;;
4198 *) { { $as_echo "$as_me:$LINENO: error: must pass path argument to --with-local-dir" >&5
4199 $as_echo "$as_me: error: must pass path argument to --with-local-dir" >&2;}
4200 { (exit 1); exit 1; }; } ;;
4201 esac
4202 { $as_echo "$as_me:$LINENO: result: $local_dir" >&5
4203 $as_echo "$local_dir" >&6; }
4204
4205 else
4206
4207 local_dir=/usr/local
4208 { $as_echo "$as_me:$LINENO: result: Defaulting to $local_dir" >&5
4209 $as_echo "Defaulting to $local_dir" >&6; }
4210
4211 fi
4212
4213 if test "$GCC" = yes -a "$local_dir" != no; then
4182 echo 'void f(){}' > conftest.c 4214 echo 'void f(){}' > conftest.c
4183 have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep '/usr/local/include'` 4215 have_local_include=`${CC-cc} -no-cpp-precomp -c -v conftest.c 2>&1 | grep "${local_dir}/include"`
4184 have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep '/usr/local/lib'` 4216 have_local_lib=`${CC-cc} -c -v conftest.c 2>&1 | grep "${local_dir}/lib"`
4185 rm -f conftest.c conftest.o 4217 rm -f conftest.c conftest.o
4186 fi 4218 fi
4187 if test -z "$have_local_lib" -a -d /usr/local/lib; then 4219 if test -z "$have_local_lib" -a -d "${local_dir}/lib"; then
4188 tt=`echo "$LDFLAGS" | sed -e 's+-L/usr/local/lib ++g' -e 's+-L/usr/local/lib$++g'` 4220 tt=`echo "$LDFLAGS" | sed -e "s+-L${local_dir}/lib ++g" -e "s+-L${local_dir}/lib$++g"`
4189 if test "$tt" = "$LDFLAGS"; then 4221 if test "$tt" = "$LDFLAGS"; then
4190 LDFLAGS="$LDFLAGS -L/usr/local/lib" 4222 LDFLAGS="$LDFLAGS -L${local_dir}/lib"
4191 fi 4223 fi
4192 fi 4224 fi
4193 if test -z "$have_local_include" -a -d /usr/local/include; then 4225 if test -z "$have_local_include" -a -d "${local_dir}/include"; then
4194 tt=`echo "$CPPFLAGS" | sed -e 's+-I/usr/local/include ++g' -e 's+-I/usr/local/include$++g'` 4226 tt=`echo "$CPPFLAGS" | sed -e "s+-I${local_dir}/include ++g" -e "s+-I${local_dir}/include$++g"`
4195 if test "$tt" = "$CPPFLAGS"; then 4227 if test "$tt" = "$CPPFLAGS"; then
4196 CPPFLAGS="$CPPFLAGS -I/usr/local/include" 4228 CPPFLAGS="$CPPFLAGS -I${local_dir}/include"
4197 fi 4229 fi
4198 fi 4230 fi
4199 fi 4231 fi
4200 4232
4201 { $as_echo "$as_me:$LINENO: checking --with-vim-name argument" >&5 4233 { $as_echo "$as_me:$LINENO: checking --with-vim-name argument" >&5