diff options
| author | Noah Watkins <noahwatkins@gmail.com> | 2013-07-20 18:41:39 -0700 |
|---|---|---|
| committer | Noah Watkins <noahwatkins@gmail.com> | 2013-07-20 18:41:39 -0700 |
| commit | abd7136cc73ee51b53128ae1ef27cdb646f3b0e8 (patch) | |
| tree | 10cb47a669bfb1b05ef64564180d5ef564174f92 | |
| parent | 83ed2887ac720e437fc22c6249f9d5c31ae886a6 (diff) | |
| download | ceph-abd7136cc73ee51b53128ae1ef27cdb646f3b0e8.tar.gz | |
autoconf: search for uuid_parse in system libs
AC_SEARCH_LIBS will first try to resolve uuid_parse in the system
libraries (OSX), and then will try other libraries (e.g. libuuid). The
$LIBS variable will be updated with the result, so we don't need an
explicit -luuid in src/Makefile.am.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 8e4ef277585..059899ec858 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ AX_C_PRETTY_FUNC # Checks for libraries. ACX_PTHREAD -AC_CHECK_LIB([uuid], [uuid_parse], [true], AC_MSG_FAILURE([libuuid not found])) +AC_SEARCH_LIBS([uuid_parse], [uuid], [], AC_MSG_FAILURE([no uuid library found])) AC_CHECK_LIB([m], [pow], [true], AC_MSG_FAILURE([libm not found])) AC_CHECK_LIB([resolv], [__res_nquery], [true], AC_MSG_FAILURE([libresolv not found])) if test x"$linux" = x"yes"; then diff --git a/src/Makefile.am b/src/Makefile.am index b7ebeceead4..339206ca05c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,7 @@ check-local: $(srcdir)/test/encoding/check-generated.sh $(srcdir)/test/encoding/readable.sh ../ceph-object-corpus -EXTRALIBS = -luuid +EXTRALIBS = if FREEBSD EXTRALIBS += -lexecinfo endif |