* configure.ac (NULL_DEVICE, SEPCHAR, USER_FULL_NAME): Move here from src.

* src/editfns.c (USER_FULL_NAME):
* src/emacs.c (SEPCHAR):
* src/process.h (NULL_DEVICE): Let configure set them.

diff --git a/ChangeLog b/ChangeLog
index 5dd559614e2268966793215783251f2a99765587..76772a601006aaea1f4bcc86f48596d1ac93afc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
+       * configure.ac (NULL_DEVICE, SEPCHAR, USER_FULL_NAME):
+       Move here from src.
+
        * configure.ac (AMPERSAND_FULL_NAME, subprocesses):
        Move here from conf_post.h.
 

diff --git a/configure.ac b/configure.ac
index a6e32cc312293b6dcb64b7aa9d681f73b47e6319..c5befd0cc35eefc27a99eeaf62da863eb38a5168 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3147,9 +3147,16 @@ dnl Compare with HAVE_INET_SOCKETS (which is unused...) above.
 AC_DEFINE(HAVE_SOCKETS, 1, [Define if the system supports
   4.2-compatible sockets.])
 
+AC_DEFINE(NULL_DEVICE, ["/dev/null"], [Name of the file to open to get
+  a null file, or a data sink.])
+
+AC_DEFINE(SEPCHAR, [':'], [Character that separates PATH elements.])
+
 dnl Everybody supports this, except MS-DOS.
 AC_DEFINE(subprocesses, 1, [Define to enable asynchronous subprocesses.])
 
+AC_DEFINE(USER_FULL_NAME, [pw->pw_gecos], [How to get a user's full name.])
+
 
 AH_TEMPLATE(NO_EDITRES, [Define if XEditRes should not be used.])
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 79f5bf821efc220d0835d1a1e1fd89368e92ef3c..4630231620491c245b93e99a003c2b5f97e80177 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
+       * process.h (NULL_DEVICE):
+       * emacs.c (SEPCHAR):
+       * editfns.c (USER_FULL_NAME): Let configure set them.
+
        * s/README, s/template.h: Remove files.
 
        * conf_post.h [HPUX]: Undefine HAVE_RANDOM and HAVE_RINT.

diff --git a/src/editfns.c b/src/editfns.c
index f174594dd977ef2f5f3057a26378a7996d55cd2c..dda6371369d9ab1e40fb402328fb11a336a73909 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -59,10 +59,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "window.h"
 #include "blockinput.h"
 
-#ifndef USER_FULL_NAME
-#define USER_FULL_NAME pw->pw_gecos
-#endif
-
 #ifndef USE_CRT_DLL
 extern char **environ;
 #endif

diff --git a/src/emacs.c b/src/emacs.c
index 81af0647742614f92281c66710c2191a74a9a4cf..bdc383c9ce150d5831f30b1ca71498f81ff055ee 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2222,9 +2222,6 @@ synchronize_system_messages_locale (void)
 }
 #endif /* HAVE_SETLOCALE */
 \f
-#ifndef SEPCHAR
-#define SEPCHAR ':'
-#endif
 
 Lisp_Object
 decode_env_path (const char *evarname, const char *defalt)

diff --git a/src/process.h b/src/process.h
index 649056a99ff34190bf6783fa08f25df96165bbe5..747540f26a9e69ee0c828d4330dccd7cf5a4e08a 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -163,12 +163,6 @@ extern int synch_process_termsig;
    this is exit code of synchronous subprocess.  */
 extern int synch_process_retcode;
 
-/* The name of the file open to get a null file, or a data sink.
-   MS-DOS, and OS/2 redefine this.  */
-#ifndef NULL_DEVICE
-#define NULL_DEVICE "/dev/null"
-#endif
-
 /* Nonzero means don't run process sentinels.  This is used
    when exiting.  */
 extern int inhibit_sentinels;