1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- configure.in.orig 2014-04-24 18:05:43 UTC
+++ configure.in
@@ -52,7 +52,7 @@ AC_ARG_WITH(openssl,
AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
else
AC_MSG_RESULT([yes])
- CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
+ AC_SUBST([OPENSSL_INCLUDE_DIR])
AC_SUBST([OPENSSL_LIB_DIR])
fi],
[AC_MSG_RESULT([no])
@@ -72,6 +72,21 @@ AC_ARG_ENABLE(gcov,
[CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
AC_MSG_RESULT([*** Enabling gcov at user request ***])],)
+# Check for tss user
+AC_ARG_WITH(tssuser,
+ [ --with-tssuser[[=USER]] set tss user [[tss]]],
+ [tss_user=$withval],
+ [tss_user=tss]
+)
+# Check for tss group
+AC_ARG_WITH(tssgroup,
+ [ --with-tssgroup[[=GROUP]] set tss group [[tss]]],
+ [tss_group=$withval],
+ [tss_group=tss]
+)
+AC_SUBST(TSS_USER_NAME, $tss_user)
+AC_SUBST(TSS_GROUP_NAME, $tss_group)
+
# profiling support
AC_ARG_ENABLE(gprof,
[AC_HELP_STRING([--enable-gprof], [enable profiling with gprof [default=off]])],
@@ -356,6 +371,8 @@ AC_PROG_LIBTOOL
AC_C_BIGENDIAN([AC_DEFINE(_BIG_ENDIAN, 1, [big-endian host])])
AC_CHECK_DECL(htole32, [AC_DEFINE(HTOLE_DEFINED, 1, [htole32 function is available])])
AC_CHECK_HEADER(sys/byteorder.h, [AC_DEFINE(HAVE_BYTEORDER_H, 1, [sys/byteorder.h header])])
+AC_CHECK_HEADER(endian.h, [AC_DEFINE(HAVE_ENDIAN_H, 1, [endian.h header])])
+AC_CHECK_HEADER(sys/endian.h, [AC_DEFINE(HAVE_SYS_ENDIAN_H, 1, [sys/endian.h header])])
AC_CHECK_FUNC(daemon, [ AC_DEFINE(HAVE_DAEMON, 1, [daemon function is available]) ])
if test "x${GCC}" = "xyes"; then
@@ -363,6 +380,7 @@ if test "x${GCC}" = "xyes"; then
fi
CFLAGS="$CFLAGS -I../include \
+ -DTSS_USER_NAME=\\\"$tss_user\\\" -DTSS_GROUP_NAME=\\\"$tss_group\\\" \
-DTCSD_DEFAULT_PORT=${TCSD_DEFAULT_PORT} -DTSS_VER_MAJOR=${TSS_VER_MAJOR} \
-DTSS_VER_MINOR=${TSS_VER_MINOR} -DTSS_SPEC_MAJOR=${TSS_SPEC_MAJOR} \
-DTSS_SPEC_MINOR=${TSS_SPEC_MINOR}"
|
