Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- a/configure	Wed Aug 24 11:22:30 2011 +0100
+++ b/configure	Wed Aug 24 23:41:29 2011 +0100
@@ -5939,8 +5939,6 @@
 if test "$with_dynamic" = "yes"; then
   case "$opsys" in
     hpux* ) opsys="${opsys}-shr" ;;
-    darwin ) $as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
- ;;
   esac
 else   case "$opsys" in
     sol2 )
@@ -13765,7 +13763,7 @@
     fi
 
     install_pp="$srcdir/lib-src/installexe.sh"
-    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
+    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
     if test "$with_dragndrop" != no; then
       dragndrop_proto="$dragndrop_proto msw" &&  if test "$verbose" = "yes"; then echo "    Appending \"msw\" to \$dragndrop_proto"; fi
       with_dragndrop=yes
@@ -13956,6 +13954,13 @@
 fi
 
 
+if test "$opsys" = "darwin"; then
+  $as_echo "#define REALPATH_CORRECTS_CASE 1" >>confdefs.h
+
+  $as_echo "#define DEFAULT_FILE_SYSTEM_IGNORE_CASE 1" >>confdefs.h
+
+fi
+
 if test "$with_modules" != "no"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for module support" >&5
 $as_echo_n "checking for module support... " >&6; }
@@ -13964,11 +13969,7 @@
 
   case "$opsys" in
     mingw* | cygwin* ) have_dl=yes ;;
-    darwin ) have_dl=yes
-      $as_echo "#define HAVE_DYLD 1" >>confdefs.h
-
-      ;;
-    * )
+    *)
             ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
 if test "x$ac_cv_header_dlfcn_h" = xyes; then :
 
@@ -14050,12 +14051,19 @@
 	$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
       else
-		ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
+                        if test "$opsys" = "darwin"; then
+          have_dl=yes
+          $as_echo "#define HAVE_DYLD 1" >>confdefs.h
+
+          $as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
+
+        else
+                    ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
 if test "x$ac_cv_header_dl_h" = xyes; then :
 
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -lc" >&5
 $as_echo_n "checking for shl_load in -lc... " >&6; }
-	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <dl.h>
 int
@@ -14071,13 +14079,13 @@
 $as_echo "$have_dl" >&6; }
 else
 
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5
+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldl" >&5
 $as_echo_n "checking for shl_load in -ldl... " >&6; }
-	    ac_save_LIBS="$LIBS"
-	    LIBS="$LIBS -ldld"
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+              ac_save_LIBS="$LIBS"
+              LIBS="$LIBS -ldld"
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <dl.h>
 int
@@ -14102,18 +14110,18 @@
 fi
 
 
-	if test "$have_dl" = "yes"; then
-	  $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
-
-	else
-	  	  ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
+          if test "$have_dl" = "yes"; then
+            $as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h
+
+          else
+                        ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
 if test "x$ac_cv_header_ltdl_h" = xyes; then :
 
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
+              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
 $as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
-	    ac_save_LIBS="$LIBS"
-	    LIBS="$LIBS -lltdl"
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+              ac_save_LIBS="$LIBS"
+              LIBS="$LIBS -lltdl"
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ltdl.h>
 int
@@ -14134,16 +14142,17 @@
 fi
 
 
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dl" >&5
 $as_echo "$have_dl" >&6; }
-	  if test "$have_dl" = "yes"; then
-	    $as_echo "#define HAVE_LTDL 1" >>confdefs.h
-
-	  fi
-		fi
+            if test "$have_dl" = "yes"; then
+              $as_echo "#define HAVE_LTDL 1" >>confdefs.h
+
+            fi
+              	  fi
+       fi
             fi
       ac_save_LIBS=
-    esac
+  esac
 
   if test -n "$have_dl"; then