Add libbsd dependency for Linux. Use <string.h> on all other systems.

SVN revision: 84352
This commit is contained in:
Leif Middelschulte 2013-02-24 23:59:11 +00:00
parent ff8fbe6e4a
commit 6d18658c5e
3 changed files with 18 additions and 3 deletions

View File

@ -29,6 +29,16 @@ AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
PKG_CHECK_MODULES(JSON, [json]) PKG_CHECK_MODULES(JSON, [json])
#
# Platform specific setup
#
#############################
case $host_os in
linux*)
PKG_CHECK_MODULES(BSD, [libbsd])
;;
esac
# Find edje_cc # Find edje_cc
PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0]) PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0])
AC_ARG_WITH(edje-cc, AC_ARG_WITH(edje-cc,

View File

@ -4,7 +4,8 @@ INCLUDES = -I. \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(includedir) \ -I$(includedir) \
@E_CFLAGS@ \ @E_CFLAGS@ \
@JSON_CFLAGS@ @JSON_CFLAGS@ \
@BSD_CFLAGS@
pkgdir = $(datadir)/$(MODULE_ARCH) pkgdir = $(datadir)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
@ -13,7 +14,7 @@ module_la_SOURCES = e_mod_main.c \
e_share.h \ e_share.h \
sourcedrop.c sourcedrop.c
module_la_LIBADD = @E_LIBS@ @JSON_LIBS@ -lm -lbsd module_la_LIBADD = @E_LIBS@ @JSON_LIBS@ @BSD_LIBS@ -lm
module_la_LDFLAGS = -module -avoid-version module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h module_la_DEPENDENCIES = $(top_builddir)/config.h

View File

@ -1,6 +1,10 @@
#include <ctype.h> #include <ctype.h>
#include <json/json.h> #include <json/json.h>
#include <bsd/string.h> #ifdef __linux__
#include <bsd/string.h> // strlcpy, etc. found in libbsd
#else
#include <string.h>
#endif
#include "e_mod_main.h" #include "e_mod_main.h"
#include "e_share.h" #include "e_share.h"