Mercurial > hg > xemacs-beta

comparison configure @ 5556:a142ad1a9140

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use dlsym() in preference to NSLookupSymbolInModule() on Darwin, if available. ChangeLog addition: 2011-08-24 Aidan Kehoe <kehoea@parhasard.net> * configure.ac: On OS X, if dlopen() is available in dlfcn.h, use it in preference to dyld; the latter API is deprecated. Move DLSYM_NEEDS_UNDERSCORE together with HAVE_DLYD, it's not needed if the dlsym() and dlopen() APIs are being used. Define REALPATH_CORRECTS_CASE, DEFAULT_FILE_SYSTEM_IGNORE_CASE in this file, don't define them in terms of HAVE_DYLD in src/config.h.in. * configure: Regenerate. src/ChangeLog addition: 2011-08-24 Aidan Kehoe <kehoea@parhasard.net> * config.h.in: Move REALPATH_CORRECTS_CASE, DEFAULT_FILE_SYSTEM_IGNORE_CASE to ../configure.ac rather than implementing them in terms of HAVE_DYLD here.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 24 Aug 2011 23:41:29 +0100
parents 1f0b15040456
children 53c066311921
comparison
equal deleted inserted replaced
5555:a39cd9dc92ba 5556:a142ad1a9140
5937 esac 5937 esac
5938 fi 5938 fi
5939 if test "$with_dynamic" = "yes"; then 5939 if test "$with_dynamic" = "yes"; then
5940 case "$opsys" in 5940 case "$opsys" in
5941 hpux* ) opsys="${opsys}-shr" ;; 5941 hpux* ) opsys="${opsys}-shr" ;;
5942 darwin ) $as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
5943 ;;
5944 esac 5942 esac
5945 else case "$opsys" in 5943 else case "$opsys" in
5946 sol2 ) 5944 sol2 )
5947 echo "Static linking is not supported on Solaris 2." 5945 echo "Static linking is not supported on Solaris 2."
5948 echo "Rerun configure without specifying --without-dynamic." 5946 echo "Rerun configure without specifying --without-dynamic."
13763 SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$SRC_SUBDIR_DEPS"; fi 13761 SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$SRC_SUBDIR_DEPS"; fi
13764 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi 13762 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR netinstall" && if test "$verbose" = "yes"; then echo " Appending \"netinstall\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
13765 fi 13763 fi
13766 13764
13767 install_pp="$srcdir/lib-src/installexe.sh" 13765 install_pp="$srcdir/lib-src/installexe.sh"
13768 libs_system="$libs_system -limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr" && if test "$verbose" = "yes"; then echo " Appending \"-limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr\" to \$libs_system"; fi 13766 libs_system="$libs_system -L/usr/lib/w32api -limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr" && if test "$verbose" = "yes"; then echo " Appending \"-L/usr/lib/w32api -limm32 -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lole32 -luuid -lwinspool -lmpr\" to \$libs_system"; fi
13769 if test "$with_dragndrop" != no; then 13767 if test "$with_dragndrop" != no; then
13770 dragndrop_proto="$dragndrop_proto msw" && if test "$verbose" = "yes"; then echo " Appending \"msw\" to \$dragndrop_proto"; fi 13768 dragndrop_proto="$dragndrop_proto msw" && if test "$verbose" = "yes"; then echo " Appending \"msw\" to \$dragndrop_proto"; fi
13771 with_dragndrop=yes 13769 with_dragndrop=yes
13772 fi 13770 fi
13773 if test "$window_system" != x11; then 13771 if test "$window_system" != x11; then
13954 else 13952 else
13955 LIBSTDCPP= 13953 LIBSTDCPP=
13956 fi 13954 fi
13957 13955
13958 13956
13957 if test "$opsys" = "darwin"; then
13958 $as_echo "#define REALPATH_CORRECTS_CASE 1" >>confdefs.h
13959
13960 $as_echo "#define DEFAULT_FILE_SYSTEM_IGNORE_CASE 1" >>confdefs.h
13961
13962 fi
13963
13959 if test "$with_modules" != "no"; then 13964 if test "$with_modules" != "no"; then
13960 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for module support" >&5 13965 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for module support" >&5
13961 $as_echo_n "checking for module support... " >&6; } 13966 $as_echo_n "checking for module support... " >&6; }
13962 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 13967 { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
13963 $as_echo "" >&6; } 13968 $as_echo "" >&6; }
13964 13969
13965 case "$opsys" in 13970 case "$opsys" in
13966 mingw* | cygwin* ) have_dl=yes ;; 13971 mingw* | cygwin* ) have_dl=yes ;;
13967 darwin ) have_dl=yes 13972 *)
13968 $as_echo "#define HAVE_DYLD 1" >>confdefs.h
13969
13970 ;;
13971 * )
13972 ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" 13973 ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
13973 if test "x$ac_cv_header_dlfcn_h" = xyes; then : 13974 if test "x$ac_cv_header_dlfcn_h" = xyes; then :
13974 13975
13975 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5 13976 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
13976 $as_echo_n "checking for dlopen in -lc... " >&6; } 13977 $as_echo_n "checking for dlopen in -lc... " >&6; }
14048 14049
14049 if test "$have_dl" = "yes"; then 14050 if test "$have_dl" = "yes"; then
14050 $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h 14051 $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
14051 14052
14052 else 14053 else
14053 ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" 14054 if test "$opsys" = "darwin"; then
14055 have_dl=yes
14056 $as_echo "#define HAVE_DYLD 1" >>confdefs.h
14057
14058 $as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
14059
14060 else
14061 ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
14054 if test "x$ac_cv_header_dl_h" = xyes; then : 14062 if test "x$ac_cv_header_dl_h" = xyes; then :
14055 14063
14056 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5 14064 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5
14057 $as_echo_n "checking for shl_load in -lc... " >&6; } 14065 $as_echo_n "checking for shl_load in -lc... " >&6; }
14058 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14066 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14059 /* end confdefs.h. */ 14067 /* end confdefs.h. */
14060 #include <dl.h> 14068 #include <dl.h>
14061 int 14069 int
14062 main () 14070 main ()
14063 { 14071 {
14069 if ac_fn_c_try_link "$LINENO"; then : 14077 if ac_fn_c_try_link "$LINENO"; then :
14070 have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5 14078 have_dl=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
14071 $as_echo "$have_dl" >&6; } 14079 $as_echo "$have_dl" >&6; }
14072 else 14080 else
14073 14081
14074 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14082 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14075 $as_echo "no" >&6; } 14083 $as_echo "no" >&6; }
14076 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5 14084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5
14077 $as_echo_n "checking for shl_load in -ldl... " >&6; } 14085 $as_echo_n "checking for shl_load in -ldl... " >&6; }
14078 ac_save_LIBS="$LIBS" 14086 ac_save_LIBS="$LIBS"
14079 LIBS="$LIBS -ldld" 14087 LIBS="$LIBS -ldld"
14080 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14088 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14081 /* end confdefs.h. */ 14089 /* end confdefs.h. */
14082 #include <dl.h> 14090 #include <dl.h>
14083 int 14091 int
14084 main () 14092 main ()
14085 { 14093 {
14100 rm -f core conftest.err conftest.$ac_objext \ 14108 rm -f core conftest.err conftest.$ac_objext \
14101 conftest$ac_exeext conftest.$ac_ext 14109 conftest$ac_exeext conftest.$ac_ext
14102 fi 14110 fi
14103 14111
14104 14112
14105 if test "$have_dl" = "yes"; then 14113 if test "$have_dl" = "yes"; then
14106 $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h 14114 $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
14107 14115
14108 else 14116 else
14109 ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default" 14117 ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
14110 if test "x$ac_cv_header_ltdl_h" = xyes; then : 14118 if test "x$ac_cv_header_ltdl_h" = xyes; then :
14111 14119
14112 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5 14120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
14113 $as_echo_n "checking for lt_dlinit in -lltdl... " >&6; } 14121 $as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
14114 ac_save_LIBS="$LIBS" 14122 ac_save_LIBS="$LIBS"
14115 LIBS="$LIBS -lltdl" 14123 LIBS="$LIBS -lltdl"
14116 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 14124 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14117 /* end confdefs.h. */ 14125 /* end confdefs.h. */
14118 #include <ltdl.h> 14126 #include <ltdl.h>
14119 int 14127 int
14120 main () 14128 main ()
14121 { 14129 {
14132 rm -f core conftest.err conftest.$ac_objext \ 14140 rm -f core conftest.err conftest.$ac_objext \
14133 conftest$ac_exeext conftest.$ac_ext 14141 conftest$ac_exeext conftest.$ac_ext
14134 fi 14142 fi
14135 14143
14136 14144
14137 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5 14145 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
14138 $as_echo "$have_dl" >&6; } 14146 $as_echo "$have_dl" >&6; }
14139 if test "$have_dl" = "yes"; then 14147 if test "$have_dl" = "yes"; then
14140 $as_echo "#define HAVE_LTDL 1" >>confdefs.h 14148 $as_echo "#define HAVE_LTDL 1" >>confdefs.h
14141 14149
14142 fi 14150 fi
14143 fi 14151 fi
14152 fi
14144 fi 14153 fi
14145 ac_save_LIBS= 14154 ac_save_LIBS=
14146 esac 14155 esac
14147 14156
14148 if test -n "$have_dl"; then 14157 if test -n "$have_dl"; then
14149 14158
14150 dll_ld= 14159 dll_ld=
14151 dll_ldflags= 14160 dll_ldflags=