* 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.

6 files changed, 14 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 5dd559614e2..76772a60100 100644
--- 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 a6e32cc3122..c5befd0cc35 100644
--- 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 79f5bf821ef..46302316204 100644
--- 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 f174594dd97..dda6371369d 100644
--- 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 81af0647742..bdc383c9ce1 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2222,9 +2222,6 @@ synchronize_system_messages_locale (void)
 }
 #endif /* HAVE_SETLOCALE */
 
-#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 649056a99ff..747540f26a9 100644
--- 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;