aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-13 00:26:50 -0700
committerGlenn Morris2010-05-13 00:26:50 -0700
commit3536f9934929a86c827fff09247b8fea54dd5f02 (patch)
tree85ec5aafcbd6b51041bb8e69348b6da03a87360f
parent7cab80f97c7bfb793e255f0d31f8fc346e8708a8 (diff)
downloademacs-3536f9934929a86c827fff09247b8fea54dd5f02.tar.gz
emacs-3536f9934929a86c827fff09247b8fea54dd5f02.zip
* configure.in: Fix some paren typos.
-rw-r--r--ChangeLog2
-rwxr-xr-xconfigure6
-rw-r--r--configure.in6
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index aa27b7772b3..f9831c6bcb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
12010-05-13 Glenn Morris <rgm@gnu.org> 12010-05-13 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.in: Fix some paren typos.
4
3 * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS. 5 * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.
4 6
5 * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define. 7 * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define.
diff --git a/configure b/configure
index 97a5b80ec0d..540f6fa91df 100755
--- a/configure
+++ b/configure
@@ -6484,7 +6484,7 @@ case $opsys in
6484 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o' 6484 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
6485 ;; 6485 ;;
6486 netbsd | openbsd ) 6486 netbsd | openbsd )
6487 if test -f $(CRT_DIR)/crti.o; then 6487 if test -f $CRT_DIR/crti.o; then
6488 LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' 6488 LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
6489 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' 6489 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
6490 else 6490 else
@@ -26578,13 +26578,13 @@ if test "x$GCC" = "xyes"; then
26578 ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then 26578 ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then
26579 ## immediately undefine it again and redefine it to empty. 26579 ## immediately undefine it again and redefine it to empty.
26580 ## Was the C_SWITCH_X_SITE part really necessary? 26580 ## Was the C_SWITCH_X_SITE part really necessary?
26581## LIB_GCC=`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name` 26581## LIB_GCC=`$CC $C_SWITCH_X_SITE -print-libgcc-file-name`
26582 LIB_GCC= 26582 LIB_GCC=
26583 fi 26583 fi
26584 ;; 26584 ;;
26585 26585
26586 ## Ask GCC where to find libgcc.a. 26586 ## Ask GCC where to find libgcc.a.
26587 *) LIB_GCC=`$(CC) -print-libgcc-file-name 2> /dev/null` ;; 26587 *) LIB_GCC=`$CC -print-libgcc-file-name 2> /dev/null` ;;
26588 esac 26588 esac
26589fi 26589fi
26590 26590
diff --git a/configure.in b/configure.in
index 8fe864e7925..84092850bb6 100644
--- a/configure.in
+++ b/configure.in
@@ -1094,7 +1094,7 @@ case $opsys in
1094 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o' 1094 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o'
1095 ;; 1095 ;;
1096 netbsd | openbsd ) 1096 netbsd | openbsd )
1097 if test -f $(CRT_DIR)/crti.o; then 1097 if test -f $CRT_DIR/crti.o; then
1098 LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o' 1098 LIB_STANDARD='-lgcc -lc -lgcc $(CRT_DIR)/crtend.o $(CRT_DIR)/crtn.o'
1099 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o' 1099 START_FILES='pre-crt0.o $(CRT_DIR)/crt0.o $(CRT_DIR)/crti.o $(CRT_DIR)/crtbegin.o'
1100 else 1100 else
@@ -3242,13 +3242,13 @@ if test "x$GCC" = "xyes"; then
3242 ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then 3242 ## FIXME? s/gnu-linux.h used to define LIB_GCC as below, then
3243 ## immediately undefine it again and redefine it to empty. 3243 ## immediately undefine it again and redefine it to empty.
3244 ## Was the C_SWITCH_X_SITE part really necessary? 3244 ## Was the C_SWITCH_X_SITE part really necessary?
3245## LIB_GCC=`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name` 3245## LIB_GCC=`$CC $C_SWITCH_X_SITE -print-libgcc-file-name`
3246 LIB_GCC= 3246 LIB_GCC=
3247 fi 3247 fi
3248 ;; 3248 ;;
3249 3249
3250 ## Ask GCC where to find libgcc.a. 3250 ## Ask GCC where to find libgcc.a.
3251 *) LIB_GCC=`$(CC) -print-libgcc-file-name 2> /dev/null` ;; 3251 *) LIB_GCC=`$CC -print-libgcc-file-name 2> /dev/null` ;;
3252 esac 3252 esac
3253fi dnl if $GCC 3253fi dnl if $GCC
3254AC_SUBST(LIB_GCC) 3254AC_SUBST(LIB_GCC)