diff -p -up xemacs-21.4.22/configure.in.orig xemacs-21.4.22/configure.in --- xemacs-21.4.22/configure.in.orig 2009-09-25 20:28:27.000000000 -0400 +++ xemacs-21.4.22/configure.in 2009-09-25 20:29:57.000000000 -0400 @@ -2039,14 +2039,14 @@ dnl Note that it's OK if the GNU style l dnl a usage message, that's often good enough. Please report it, though. dnl #### Should make this Solaris-friendly. dnl Link with -z nocombreloc for now. -if test "$pdump" != "yes"; then - AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag) - case "`ld --help 2>&1`" in - *-z\ nocombreloc* ) AC_MSG_RESULT(yes) - XE_PREPEND(-z nocombreloc, ld_switch_site) ;; - *) AC_MSG_RESULT(no) ;; - esac -fi +dnl if test "$pdump" != "yes"; then +dnl AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag) +dnl case "`ld --help 2>&1`" in +dnl *-z\ nocombreloc* ) AC_MSG_RESULT(yes) +dnl XE_PREPEND(-z nocombreloc, ld_switch_site) ;; +dnl *) AC_MSG_RESULT(no) ;; +dnl esac +dnl fi dnl Inform compiler that certain flags are meant for the linker @@ -2882,10 +2882,8 @@ dnl Avoid re-AC_DEFINE-ing xmkmf symbols dnl Some broken systems require the magic "-b i486-linuxaout" flag AC_CHECK_LIB(X11, XOpenDisplay, have_lib_x11=yes) if test "$have_lib_x11" != "yes"; then - AC_CHECK_LIB(X11, XGetFontProperty, - ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site", - [AC_MSG_ERROR("Unable to find X11 libraries.")], - -b i486-linuxaout) + AC_CHECK_LIB(X11, XGetFontProperty, $ld_switch_x_site + AC_MSG_ERROR("Unable to find X11 libraries.")) fi libs_x="-lX11" test "$extra_verbose" = "yes" && echo " Setting libs_x to \"-lX11\""