diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-10 09:41:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-10 09:41:48 +0200 |
| commit | c84896d9e46ccf4dbef752cae7a9b9ab73ef39e4 (patch) | |
| tree | bb3d5c13889b1d056397cef88a4ccb524eb4ff62 | |
| parent | 980523a7de83f6a492e633648467118c84adbe12 (diff) | |
| parent | 08a63f4987b7bfd694a85b53b3385af3bda3ad2f (diff) | |
| download | rsyslog-c84896d9e46ccf4dbef752cae7a9b9ab73ef39e4.tar.gz rsyslog-c84896d9e46ccf4dbef752cae7a9b9ab73ef39e4.tar.bz2 rsyslog-c84896d9e46ccf4dbef752cae7a9b9ab73ef39e4.zip | |
Merge branch 'v7-stable'
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1344f076..915821f0 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,10 @@ case "${host}" in AC_DEFINE([OS_SOLARIS], [1], [Indicator for a Solaris OS]) AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], [1], [Use POSIX pthread semantics]) SOL_LIBS="-lsocket -lnsl" + # Solaris libuuid does not ship with a pkgconfig file so override the appropriate + # variables (but only if they have not been set by the user). + LIBUUID_CFLAGS=${LIBUUID_CFLAGS:= } + LIBUUID_LIBS=${LIBUUID_LIBS:=-luuid} AC_SUBST(SOL_LIBS) ;; esac |