[Emacs-diffs] /srv/bzr/emacs/trunk r105908: * configure.in (CRT_DIR): Fix netbsd/openbsd handling.

[Glenn Morris]

------------------------------------------------------------
revno: 105908
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-24 12:06:20 -0700
message:
  * configure.in (CRT_DIR): Fix netbsd/openbsd handling.
  
  Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00562.html
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-09-19 08:26:50 +0000
+++ b/ChangeLog 2011-09-24 19:06:20 +0000
@@ -1,3 +1,7 @@
+2011-09-24  Glenn Morris  <address@hidden>
+
+       * configure.in (CRT_DIR): Fix netbsd/openbsd handling.
+
 2011-09-19  Lars Magne Ingebrigtsen  <address@hidden>
 
        * .dir-locals.el: Change the debbugs regexp to allow having the

=== modified file 'configure.in'
--- a/configure.in      2011-09-15 03:01:25 +0000
+++ b/configure.in      2011-09-24 19:06:20 +0000
@@ -985,6 +985,7 @@
 LIB_STANDARD=
 START_FILES=
 
+dnl NB do not use CRT_DIR unquoted here, since it might not be set yet.
 case $opsys in
   cygwin )
     LIB_MATH=
@@ -1007,14 +1008,10 @@
     LIB_STANDARD=-lc
     START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
     ;;
+  dnl NB this may be adjusted below.
   netbsd | openbsd )
-    if test -f $CRT_DIR/crti.o; then
-       LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
-        START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o 
$(CRT_DIR)/crtbegin.o'
-    else
-       LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'
-       START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o'
-    fi
+    LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o'
+    START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crtbegin.o'
     ;;
 esac
 
@@ -1094,6 +1091,19 @@
 
 AC_SUBST(CRT_DIR)
 
+case $opsys in
+  netbsd | openbsd )
+    if test -f $CRT_DIR/crti.o; then
+
+        test -f $CRT_DIR/crtn.o || \
+          AC_MSG_ERROR([Required file not found: crtn.o])
+
+        LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
+        START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o 
$(CRT_DIR)/crtbegin.o'
+    fi
+    ;;
+esac
+
 
 dnl This function definition taken from Gnome 2.0
 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, 
action-not)