* Pass SYSTEM through config.h, and allow spaces.
This commit is contained in:
parent
759c953196
commit
d4779abc04
3 changed files with 6 additions and 2 deletions
|
@ -21,6 +21,7 @@ sys_name=`uname -s | tr [A-Z] [a-z]`
|
||||||
system="${machine_name}-${sys_name}"
|
system="${machine_name}-${sys_name}"
|
||||||
AC_MSG_RESULT($system)
|
AC_MSG_RESULT($system)
|
||||||
AC_SUBST(system)
|
AC_SUBST(system)
|
||||||
|
AC_DEFINE_UNQUOTED(SYSTEM, ["$system"], [platform identifier (`cpu-os')])
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_CXX
|
AC_PROG_CXX
|
||||||
|
@ -43,7 +44,8 @@ AC_CHECK_HEADERS([locale])
|
||||||
AC_LANG_POP(C++)
|
AC_LANG_POP(C++)
|
||||||
|
|
||||||
AC_DEFUN([NEED_PROG],
|
AC_DEFUN([NEED_PROG],
|
||||||
[AC_PATH_PROG($1, $2)
|
[
|
||||||
|
AC_PATH_PROG($1, $2)
|
||||||
if test -z "$$1"; then
|
if test -z "$$1"; then
|
||||||
AC_MSG_ERROR([$1 is required])
|
AC_MSG_ERROR([$1 is required])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -3,7 +3,7 @@ noinst_LIBRARIES = libutil.a
|
||||||
libutil_a_SOURCES = util.cc util.hh hash.cc hash.hh \
|
libutil_a_SOURCES = util.cc util.hh hash.cc hash.hh \
|
||||||
archive.cc archive.hh md5.c md5.h aterm.cc aterm.hh
|
archive.cc archive.hh md5.c md5.h aterm.cc aterm.hh
|
||||||
|
|
||||||
AM_CXXFLAGS = -DSYSTEM=\"@system@\" -Wall -I.. ${aterm_include}
|
AM_CXXFLAGS = -Wall -I.. ${aterm_include}
|
||||||
|
|
||||||
check_PROGRAMS = test-aterm
|
check_PROGRAMS = test-aterm
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
Loading…
Reference in a new issue