[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114752: Auto-commit of generated files.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114752: Auto-commit of generated files. |
Date: |
Wed, 23 Oct 2013 10:17:45 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114752
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-23 06:17:41 -0400
message:
Auto-commit of generated files.
modified:
autogen/config.in config.in-20091113204419-o5vbwnq5f7feedwu-185
autogen/configure configure-20091113204419-o5vbwnq5f7feedwu-1624
=== modified file 'autogen/config.in'
--- a/autogen/config.in 2013-10-12 10:17:41 +0000
+++ b/autogen/config.in 2013-10-23 10:17:41 +0000
@@ -1689,7 +1689,7 @@
# define _GL_EXTERN_INLINE_IN_USE
#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
&& !defined _GL_EXTERN_INLINE_APPLE_BUG)
-# if __GNUC_GNU_INLINE__
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
/* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
# else
=== modified file 'autogen/configure'
--- a/autogen/configure 2013-10-14 10:17:44 +0000
+++ b/autogen/configure 2013-10-23 10:17:41 +0000
@@ -4604,30 +4604,6 @@
fi
-#### Make srcdir absolute, if it isn't already. It's important to
-#### avoid running the file name through pwd unnecessarily, since pwd can
-#### give you automounter prefixes, which can go away. We do all this
-#### so Emacs can find its files when run uninstalled.
-## Make sure CDPATH doesn't affect cd (in case PWD is relative).
-unset CDPATH
-case "${srcdir}" in
- [\\/]* | ?:[\\/]*) ;;
- . )
- ## We may be able to use the $PWD environment variable to make this
- ## absolute. But sometimes PWD is inaccurate.
- ## Note: we used to use $PWD at the end instead of `pwd`,
- ## but that tested only for a well-formed and valid PWD,
- ## it did not object when PWD was well-formed and valid but just wrong.
- if test ".$PWD" != "." && test ".`(cd "$PWD" ; sh -c pwd)`" = ".`pwd`" ;
- then
- srcdir="$PWD"
- else
- srcdir=`(cd "$srcdir"; pwd)`
- fi
- ;;
- * ) srcdir=`(cd "$srcdir"; pwd)` ;;
-esac
-
#### When building with MinGW inside the MSYS tree, 'pwd' produces
#### directories relative to the root of the MSYS tree,
#### e.g. '/home/user/foo' instead of '/d/MSYS/home/user/foo'. When
@@ -4637,7 +4613,7 @@
#### substitution, it cannot find the data directory. "pwd -W"
#### produces Windows-style 'd:/foo/bar' absolute directory names, so
#### we use it here to countermand that lossage.
-test "$MSYSTEM" = "MINGW32" && srcdir=`(cd "$srcdir"; pwd -W | sed -e
's,^\([A-Za-z]\):,/\1,')`
+test "$MSYSTEM" = "MINGW32" && abs_srcdir=`(cd "$abs_srcdir"; pwd -W | sed -e
's,^\([A-Za-z]\):,/\1,')`
### Canonicalize the configuration name.
@@ -25592,10 +25568,8 @@
if test "${gl_cv_func_working_acl_get_file+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then :
- gl_cv_func_working_acl_get_file=cross-compiling
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ gl_cv_func_working_acl_get_file=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/acl.h>
@@ -25612,20 +25586,19 @@
return 0;
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- gl_cv_func_working_acl_get_file=yes
-else
- gl_cv_func_working_acl_get_file=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+if ac_fn_c_try_link "$LINENO"; then :
+ if test $cross_compiling = yes; then
+ gl_cv_func_working_acl_get_file="guessing yes"
+ elif ./conftest$ac_exeext; then
+ gl_cv_func_working_acl_get_file=yes
+ fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$gl_cv_func_working_acl_get_file" >&5
$as_echo "$gl_cv_func_working_acl_get_file" >&6; }
-
- if test $gl_cv_func_working_acl_get_file = yes; then :
+ if test "$gl_cv_func_working_acl_get_file" != no; then :
use_acl=1
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114752: Auto-commit of generated files.,
Glenn Morris <=