Mercurial > emacs
comparison configure @ 109432:b3c31bb21485
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Mon, 12 Jul 2010 22:43:26 +0000 |
parents | b7e047772c64 |
children | 9bc9a6ac1dd8 |
comparison
equal
deleted
inserted
replaced
109431:799b50142743 | 109432:b3c31bb21485 |
---|---|
722 INSTALL_INFO | 722 INSTALL_INFO |
723 RANLIB | 723 RANLIB |
724 INSTALL_DATA | 724 INSTALL_DATA |
725 INSTALL_SCRIPT | 725 INSTALL_SCRIPT |
726 INSTALL_PROGRAM | 726 INSTALL_PROGRAM |
727 C_WARNINGS_SWITCH | |
727 EGREP | 728 EGREP |
728 GREP | 729 GREP |
729 CPP | 730 CPP |
730 OBJEXT | 731 OBJEXT |
731 EXEEXT | 732 EXEEXT |
740 host | 741 host |
741 build_os | 742 build_os |
742 build_vendor | 743 build_vendor |
743 build_cpu | 744 build_cpu |
744 build | 745 build |
746 PROFILING_LDFLAGS | |
747 PROFILING_CFLAGS | |
745 MAINT | 748 MAINT |
746 GZIP_INFO | 749 GZIP_INFO |
747 target_alias | 750 target_alias |
748 host_alias | 751 host_alias |
749 build_alias | 752 build_alias |
3011 else | 3014 else |
3012 PROFILING_CFLAGS= | 3015 PROFILING_CFLAGS= |
3013 PROFILING_LDFLAGS= | 3016 PROFILING_LDFLAGS= |
3014 fi | 3017 fi |
3015 | 3018 |
3019 | |
3020 | |
3016 # Check whether --enable-autodepend was given. | 3021 # Check whether --enable-autodepend was given. |
3017 if test "${enable_autodepend+set}" = set; then : | 3022 if test "${enable_autodepend+set}" = set; then : |
3018 enableval=$enable_autodepend; ac_enable_autodepend="${enableval}" | 3023 enableval=$enable_autodepend; ac_enable_autodepend="${enableval}" |
3019 else | 3024 else |
3020 ac_enable_autodepend=yes | 3025 ac_enable_autodepend=yes |
4311 test x$cc_specified != xyes | 4316 test x$cc_specified != xyes |
4312 then | 4317 then |
4313 CC="$NON_GNU_CC" | 4318 CC="$NON_GNU_CC" |
4314 fi | 4319 fi |
4315 | 4320 |
4316 if test x$GCC = xyes; then | |
4317 C_OPTIMIZE_SWITCH=-O2 | |
4318 test "x$GCC_TEST_OPTIONS" != x && CC="$CC $GCC_TEST_OPTIONS" | |
4319 else | |
4320 C_OPTIMIZE_SWITCH=-O | |
4321 test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" | |
4322 fi | |
4323 | |
4324 ac_ext=c | 4321 ac_ext=c |
4325 ac_cpp='$CPP $CPPFLAGS' | 4322 ac_cpp='$CPP $CPPFLAGS' |
4326 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 4323 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
4327 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 4324 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4328 ac_compiler_gnu=$ac_cv_c_compiler_gnu | 4325 ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4871 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 | 4868 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 |
4872 $as_echo "$has_option" >&6; } | 4869 $as_echo "$has_option" >&6; } |
4873 CFLAGS="$SAVE_CFLAGS" | 4870 CFLAGS="$SAVE_CFLAGS" |
4874 unset has_option | 4871 unset has_option |
4875 unset SAVE_CFLAGS | 4872 unset SAVE_CFLAGS |
4873 | |
4876 | 4874 |
4877 | 4875 |
4878 #### Some other nice autoconf tests. | 4876 #### Some other nice autoconf tests. |
4879 | 4877 |
4880 ac_ext=c | 4878 ac_ext=c |
5483 $as_echo "no" >&6; } | 5481 $as_echo "no" >&6; } |
5484 fi | 5482 fi |
5485 rm -f core conftest.err conftest.$ac_objext \ | 5483 rm -f core conftest.err conftest.$ac_objext \ |
5486 conftest$ac_exeext conftest.$ac_ext | 5484 conftest$ac_exeext conftest.$ac_ext |
5487 | 5485 |
5488 LDFLAGS="${LDFLAGS} ${PROFILING_LDFLAGS}" | |
5489 | |
5490 | 5486 |
5491 # The value of CPP is a quoted variable reference, so we need to do this | 5487 # The value of CPP is a quoted variable reference, so we need to do this |
5492 # to get its actual value... | 5488 # to get its actual value... |
5493 CPP=`eval "echo $CPP"` | 5489 CPP=`eval "echo $CPP"` |
5494 | |
5495 | |
5496 ### First figure out CFLAGS (which we use for running the compiler here) | |
5497 ### and REAL_CFLAGS (which we use for real compilation). | |
5498 ### The two are the same except when using GCC where we might use | |
5499 ### extra warning and profiling flags. | |
5500 | |
5501 ### If the CFLAGS env var is specified, we use that value | |
5502 ### instead of the default. | |
5503 | |
5504 if test "x$SPECIFIED_CFLAGS" = x; then | |
5505 CFLAGS="-g $C_OPTIMIZE_SWITCH" | |
5506 if test x$GCC = xyes; then | |
5507 REAL_CFLAGS="$CFLAGS $C_WARNINGS_SWITCH $PROFILING_CFLAGS" | |
5508 else | |
5509 REAL_CFLAGS="$CFLAGS" | |
5510 fi | |
5511 else | |
5512 REAL_CFLAGS="$CFLAGS" | |
5513 fi | |
5514 | 5490 |
5515 | 5491 |
5516 CANNOT_DUMP=no | 5492 CANNOT_DUMP=no |
5517 case "$opsys" in | 5493 case "$opsys" in |
5518 your-opsys-here) | 5494 your-opsys-here) |
7415 NS_IMPL_GNUSTEP=no | 7391 NS_IMPL_GNUSTEP=no |
7416 tmp_CPPFLAGS="$CPPFLAGS" | 7392 tmp_CPPFLAGS="$CPPFLAGS" |
7417 tmp_CFLAGS="$CFLAGS" | 7393 tmp_CFLAGS="$CFLAGS" |
7418 CPPFLAGS="$CPPFLAGS -x objective-c" | 7394 CPPFLAGS="$CPPFLAGS -x objective-c" |
7419 CFLAGS="$CFLAGS -x objective-c" | 7395 CFLAGS="$CFLAGS -x objective-c" |
7420 TEMACS_LDFLAGS2="\${LDFLAGS}" | 7396 TEMACS_LDFLAGS2="\${LDFLAGS} \${PROFILING_LDFLAGS}" |
7421 if test "${with_ns}" != no; then | 7397 if test "${with_ns}" != no; then |
7422 if test "${opsys}" = darwin; then | 7398 if test "${opsys}" = darwin; then |
7423 NS_IMPL_COCOA=yes | 7399 NS_IMPL_COCOA=yes |
7424 ns_appdir=`pwd`/nextstep/Emacs.app/ | 7400 ns_appdir=`pwd`/nextstep/Emacs.app/ |
7425 ns_appbindir=${ns_appdir}Contents/MacOS/ | 7401 ns_appbindir=${ns_appdir}Contents/MacOS/ |
7439 GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}" | 7415 GNUSTEP_LOCAL_HEADERS="-I${GNUSTEP_LOCAL_HEADERS}" |
7440 test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \ | 7416 test "x${GNUSTEP_LOCAL_LIBRARIES}" != "x" && \ |
7441 GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}" | 7417 GNUSTEP_LOCAL_LIBRARIES="-L${GNUSTEP_LOCAL_LIBRARIES}" |
7442 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" | 7418 CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" |
7443 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" | 7419 CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" |
7444 REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}" | |
7445 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}" | 7420 LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES}" |
7446 LIB_STANDARD= | 7421 LIB_STANDARD= |
7447 START_FILES= | 7422 START_FILES= |
7448 TEMACS_LDFLAGS2= | 7423 TEMACS_LDFLAGS2= |
7449 fi | 7424 fi |
8073 | 8048 |
8074 # Change CFLAGS and CPPFLAGS temporarily so that C_SWITCH_X_SITE gets | 8049 # Change CFLAGS and CPPFLAGS temporarily so that C_SWITCH_X_SITE gets |
8075 # used for the tests that follow. We set them back to REAL_CFLAGS and | 8050 # used for the tests that follow. We set them back to REAL_CFLAGS and |
8076 # REAL_CPPFLAGS later on. | 8051 # REAL_CPPFLAGS later on. |
8077 | 8052 |
8053 REAL_CFLAGS="$CFLAGS" | |
8078 REAL_CPPFLAGS="$CPPFLAGS" | 8054 REAL_CPPFLAGS="$CPPFLAGS" |
8079 | 8055 |
8080 if test "${HAVE_X11}" = "yes"; then | 8056 if test "${HAVE_X11}" = "yes"; then |
8081 DEFS="$C_SWITCH_X_SITE $DEFS" | 8057 DEFS="$C_SWITCH_X_SITE $DEFS" |
8082 LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE" | 8058 LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE" |