diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-09-24 12:06:20 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-09-24 12:06:20 -0700 |
| commit | 0538fab0dd00a11b5dbe47a67ea0bf710733dc73 (patch) | |
| tree | 03eb0307e3c76a719e4ce09a1d3cb90a28b18fce | |
| parent | 371d6a61466a2efe33a3d61a91cb8680b8db6277 (diff) | |
| download | emacs-0538fab0dd00a11b5dbe47a67ea0bf710733dc73.tar.gz | |
* configure.in (CRT_DIR): Fix netbsd/openbsd handling.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00562.html
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 24 |
2 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 7c7bff452ae..4162152ccd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-24 Glenn Morris <rgm@gnu.org> + + * configure.in (CRT_DIR): Fix netbsd/openbsd handling. + 2011-09-19 Lars Magne Ingebrigtsen <larsi@gnus.org> * .dir-locals.el: Change the debbugs regexp to allow having the diff --git a/configure.in b/configure.in index 63b80e40466..3d92093bedd 100644 --- a/configure.in +++ b/configure.in @@ -985,6 +985,7 @@ LIB_MATH=-lm 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 @@ case $opsys in 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 @@ fi # crt_files != "" 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) |