summaryrefslogtreecommitdiff
path: root/autogen
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-07-31 19:03:04 -0400
committerGlenn Morris <rgm@gnu.org>2012-07-31 19:03:04 -0400
commit8ad96b1dcc1b88428f7705558c35e89007e52013 (patch)
treef2010ccca234d9ba74439de30fd48fbc797a0d74 /autogen
parent476b1b2da13aabbc29083282b8850d9522ab2982 (diff)
downloademacs-8ad96b1dcc1b88428f7705558c35e89007e52013.tar.gz
Auto-commit of generated files.
Diffstat (limited to 'autogen')
-rw-r--r--autogen/config.in16
-rwxr-xr-xautogen/configure43
2 files changed, 56 insertions, 3 deletions
diff --git a/autogen/config.in b/autogen/config.in
index b08eb6cea1f..d552b72be6c 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -31,6 +31,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Define to use the convention that & in the full name stands for the login
+ id. */
+#undef AMPERSAND_FULL_NAME
+
/* Define to the number of bits in type 'ptrdiff_t'. */
#undef BITSIZEOF_PTRDIFF_T
@@ -1155,6 +1159,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you are using NS windowing under GNUstep. */
#undef NS_IMPL_GNUSTEP
+/* Name of the file to open to get a null file, or a data sink. */
+#undef NULL_DEVICE
+
/* Define to 1 if the nlist n_name member is a pointer */
#undef N_NAME_POINTER
@@ -1237,6 +1244,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if emacs.c needs to call run_time_remap; for HPUX. */
#undef RUN_TIME_REMAP
+/* Character that separates PATH elements. */
+#undef SEPCHAR
+
/* Define if process.c:child_setup should not call setpgrp. */
#undef SETPGRP_RELEASES_CTTY
@@ -1321,6 +1331,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if the system has Unix98 PTYs. */
#undef UNIX98_PTYS
+/* How to get a user's full name. */
+#undef USER_FULL_NAME
+
/* Define to 1 if using GTK. */
#undef USE_GTK
@@ -1557,6 +1570,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define as a signed type of the same size as size_t. */
#undef ssize_t
+/* Define to enable asynchronous subprocesses. */
+#undef subprocesses
+
/* Define to any substitute for sys_siglist. */
#undef sys_siglist
diff --git a/autogen/configure b/autogen/configure
index e17d72684c4..269987bf2df 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -11283,8 +11283,22 @@ fi
LIBXP=
if test "${USE_X_TOOLKIT}" = "MOTIF"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif version 2.1" >&5
-$as_echo_n "checking for Motif version 2.1... " >&6; }
+ # OpenMotif may be installed in such a way on some GNU/Linux systems.
+ if test -d /usr/include/openmotif; then
+ CPPFLAGS="-I/usr/include/openmotif $CPPFLAGS"
+ emacs_cv_openmotif=yes
+ case "$canonical" in
+ x86_64-*-linux-gnu* | powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*)
+ test -d /usr/lib64/openmotif && LDFLAGS="-L/usr/lib64/openmotif $LDFLAGS"
+ ;;
+ *)
+ test -d /usr/lib/openmotif && LDFLAGS="-L/usr/lib/openmotif $LDFLAGS"
+ esac
+ else
+ emacs_cv_openmotif=no
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (Open)Motif version 2.1" >&5
+$as_echo_n "checking for (Open)Motif version 2.1... " >&6; }
if test "${emacs_cv_motif_version_2_1+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -11353,6 +11367,9 @@ if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then :
LIBXP=-lXp
fi
+ if test x$emacs_cv_openmotif = xyes; then
+ REAL_CPPFLAGS="-I/usr/include/openmotif $REAL_CPPFLAGS"
+ fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LessTif where some systems put it" >&5
$as_echo_n "checking for LessTif where some systems put it... " >&6; }
@@ -13031,7 +13048,7 @@ fi
## version number A.09.05.
## You can fix the math library by installing patch number PHSS_4630.
## But we can fix it more reliably for Emacs by just not using rint.
-## We also skip HAVE_RANDOM - see comments in src/s/hpux10-20.h.
+## We also skip HAVE_RANDOM - see comments in src/conf_post.h.
case $opsys in
hpux*) : ;;
*) for ac_func in random rint
@@ -14625,6 +14642,10 @@ fi
+$as_echo "#define AMPERSAND_FULL_NAME 1" >>confdefs.h
+
+
+
$as_echo "#define CLASH_DETECTION 1" >>confdefs.h
@@ -14638,6 +14659,22 @@ $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
+$as_echo "#define NULL_DEVICE \"/dev/null\"" >>confdefs.h
+
+
+
+$as_echo "#define SEPCHAR ':'" >>confdefs.h
+
+
+
+$as_echo "#define subprocesses 1" >>confdefs.h
+
+
+
+$as_echo "#define USER_FULL_NAME pw->pw_gecos" >>confdefs.h
+
+
+
case $opsys in