diff options
| author | Noah Watkins <noahwatkins@gmail.com> | 2013-07-20 18:41:39 -0700 |
|---|---|---|
| committer | Noah Watkins <noahwatkins@gmail.com> | 2013-09-17 10:10:35 -0700 |
| commit | 2080f258cc118665d508aa2eac5a45c9498ea21c (patch) | |
| tree | 57fbac4b7f5afca0f5b9c0c9201a0a62ea2f6511 | |
| parent | 1688d64d905be9cf15d5fc7a9d69ae5774361c1e (diff) | |
| download | ceph-2080f258cc118665d508aa2eac5a45c9498ea21c.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-env.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7ec5993096d..7d0d6a6fbea 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,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-env.am b/src/Makefile-env.am index cc9ffc62f12..389e3ef9fdd 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -94,7 +94,8 @@ AM_CCASFLAGS = -f elf64 ##################### ## library definitions and dependencies -EXTRALIBS = -luuid -lm -lkeyutils +# FIXME: add uuid +EXTRALIBS = -lm -lkeyutils if FREEBSD EXTRALIBS += -lexecinfo endif # FREEBSD |