[Emacs-diffs] Changes to emacs/configure [emacs-unicode-2]

[Miles Bader]

Index: emacs/configure
diff -c emacs/configure:1.119.2.4 emacs/configure:1.119.2.5
*** emacs/configure:1.119.2.4   Mon Apr 19 07:18:52 2004
--- emacs/configure     Mon Jun 28 07:28:19 2004
***************
*** 1573,1587 ****
     use GNU make.  If you do not have GNU make, then you must
     now do \`make distclean' in ${srcdir},
     and then run $0 again." >&2;}
- 
- extrasub='/^VPATH[     ]*=/c\
- vpath %.c $(srcdir)\
- vpath %.h $(srcdir)\
- vpath %.y $(srcdir)\
- vpath %.l $(srcdir)\
- vpath %.s $(srcdir)\
- vpath %.in $(srcdir)\
- vpath %.texi $(srcdir)'
  fi
  
  #### Given the configuration name, set machfile and opsysfile to the
--- 1573,1578 ----
***************
*** 4193,4198 ****
--- 4184,4237 ----
  fi
  
  
+ late_LDFLAGS=$LDFLAGS
+ if test "$GCC" = yes; then
+   LDFLAGS="$LDFLAGS -Wl,-znocombreloc"
+ else
+   LDFLAGS="$LDFLAGS -znocombreloc"
+ fi
+ 
+ echo "$as_me:$LINENO: checking For -znocombreloc" >&5
+ echo $ECHO_N "checking For -znocombreloc... $ECHO_C" >&6
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ main(){return 0;}
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ LDFLAGS=$late_LDFLAGS
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
  
  echo "$as_me:$LINENO: checking for egrep" >&5
  echo $ECHO_N "checking for egrep... $ECHO_C" >&6