diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-07-18 16:35:57 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-07-18 16:35:57 +0200 |
| commit | 8ce4f47adb343aed069862a05b5e315173b17823 (patch) | |
| tree | 20e5fc72fdd0cd3153c2c133b1dffecefd1a5d3d | |
| parent | e3166eecfe7a04f0f622bd93e8a6a1faa672a029 (diff) | |
| download | xorg-lib-libSM-8ce4f47adb343aed069862a05b5e315173b17823.tar.gz | |
If we don't have libuuid, build without it instead of failing
Only error out if configure was given --with-libuuid but we
don't find it.
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f534bd2..faf8c4d 100644 --- a/configure.ac +++ b/configure.ac @@ -36,11 +36,14 @@ AC_HEADER_STDC XTRANS_CONNECTION_FLAGS AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs])) -AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" != xno) if test x"$with_libuuid" != xno; then - PKG_CHECK_MODULES(LIBUUID, uuid) + PKG_CHECK_MODULES(LIBUUID, uuid, [HAVE_LIBUUID=yes], [HAVE_LIBUUID=no]) fi +if test x"$with_libuuid" = xyes && test HAVE_LIBUUID = no; then + AC_MSG_ERROR([requested libuuid support but uuid.pc not found]) +fi +AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes) if test "x$GCC" = "xyes"; then GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ |