Browse Source

[mod_webdav] fix uuid detection macro

github: #97

x-ref:
  https://github.com/lighttpd/lighttpd1.4/pull/97
personal/stbuehler/ci-build
yangfl 3 years ago
committed by Glenn Strauss
parent
commit
6962fc2a5a
  1. 4
      configure.ac
  2. 2
      src/CMakeLists.txt
  3. 2
      src/meson.build
  4. 2
      src/mod_webdav.c

4
configure.ac

@ -963,8 +963,8 @@ if test "$WITH_WEBDAV_LOCKS" != no; then
)
fi
AC_DEFINE([HAVE_UUID], [1], [libuuid])
AC_DEFINE([HAVE_UUID_H], [1], [uuid/uuid.h is available])
AC_DEFINE([HAVE_LIBUUID], [1], [libuuid])
AC_DEFINE([HAVE_UUID_UUID_H], [1], [uuid/uuid.h is available])
AC_SUBST([UUID_LIBS])
fi

2
src/CMakeLists.txt

@ -911,7 +911,7 @@ endif()
if(HAVE_LIBXML_H)
target_link_libraries(mod_webdav ${XML2_LDFLAGS})
endif()
if(HAVE_UUID_H)
if(HAVE_UUID_UUID_H)
if(NEED_LIBUUID)
set(L_MOD_WEBDAV ${L_MOD_WEBDAV} uuid)
endif()

2
src/meson.build

@ -465,7 +465,7 @@ if get_option('with_webdav_locks')
error('Couldn\'t find uuid/uuid.h or uuid_generate in lib c and uuid')
endif
endif
conf_data.set('HAVE_UUID', true)
conf_data.set('HAVE_LIBUUID', true)
conf_data.set('HAVE_UUID_UUID_H', true)
endif

2
src/mod_webdav.c

@ -192,7 +192,7 @@
#include <libxml/parser.h>
#include <sqlite3.h>
#if defined(HAVE_UUID) && defined(HAVE_UUID_UUID_H)
#if defined(HAVE_LIBUUID) && defined(HAVE_UUID_UUID_H)
#define USE_LOCKS
#include <uuid/uuid.h>
#endif

Loading…
Cancel
Save