[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100211: Regenerate configure.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100211: Regenerate configure. |
Date: |
Sun, 09 May 2010 19:21:42 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100211
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-09 19:21:42 -0700
message:
Regenerate configure.
modified:
configure
=== modified file 'configure'
--- a/configure 2010-05-10 00:11:40 +0000
+++ b/configure 2010-05-10 02:21:42 +0000
@@ -704,6 +704,7 @@
LD_SWITCH_SYSTEM
C_SWITCH_MACHINE
C_SWITCH_SYSTEM
+LIBS_SYSTEM
CRT_DIR
LIB_MATH
START_FILES
@@ -5838,10 +5839,6 @@
echo '
#include "'${srcdir}'/src/'${opsysfile}'"
#include "'${srcdir}'/src/'${machfile}'"
-#ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM
-#endif
-configure___ libsrc_libs=LIBS_SYSTEM
configure___ LIBX=-lX11
@@ -6037,6 +6034,23 @@
+LIBS_SYSTEM=
+case "$opsys" in
+ ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
+ aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
+
+ freebsd) LIBS_SYSTEM="-lutil" ;;
+
+ hpux*) LIBS_SYSTEM="-l:libdld.sl" ;;
+
+ sol2*) LIBS_SYSTEM="-lsocket -lnsl -lkstat" ;;
+
+ ## Motif needs -lgen.
+ unixware) LIBS_SYSTEM="-lsocket -lnsl -lelf -lgen" ;;
+esac
+
+
+
### Make sure subsequent tests use flags consistent with the build flags.
if test x"${OVERRIDE_CPPFLAGS}" != x; then
@@ -10940,7 +10954,7 @@
REL_ALLOC=no
fi
-LIBS="$libsrc_libs $LIBS"
+LIBS="$LIBS_SYSTEM $LIBS"
{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
@@ -11158,6 +11172,18 @@
fi
+## Note: when using cpp in s/aix4.2.h, this definition depended on
+## HAVE_LIBPTHREADS. That was not defined earlier in configure when
+## the system file was sourced. Hence the value of LIBS_SYSTEM
+## added to LIBS in configure would never contain the pthreads part,
+## but the value used in Makefiles might. FIXME?
+##
+## -lpthreads seems to be necessary for Xlib in X11R6, and should
+## be harmless on older versions of X where it happens to exist.
+test "$opsys" = "aix4-2" && \
+ test $ac_cv_lib_pthreads_cma_open = yes && \
+ LIBS_SYSTEM="$LIBS_SYSTEM -lpthreads"
+
case ${host_os} in
aix*)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100211: Regenerate configure.,
Glenn Morris <=