Commit e1d8939bfb807865c04295418e259cff3d2eb561
2020-01-20T16:05:02
fix build on Linux
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/Makefile.am b/Makefile.am
index ec241f2..79b6ed4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,7 @@ AM_CFLAGS = -DNDEBUG -O2
endif
lib_LTLIBRARIES += librtbuf.la
+librtbuf_la_CFLAGS = ${LIBRTBUF_CFLAGS}
librtbuf_la_LIBADD = ${LIBRTBUF_LIBS}
librtbuf_la_SOURCES = \
symbol.c \
diff --git a/configure.ac b/configure.ac
index 1e47947..dc7c354 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,10 @@ if test -d /usr/lib; then
LDFLAGS="$LDFLAGS -L/usr/lib"
fi
+AC_SEARCH_LIBS([strlcpy], [bsd],
+ [LIBRTBUF_CFLAGS="-I/usr/include/bsd -DLIBBSD_OVERLAY"
+ LIBRTBUF_LIBS="$LIBRTBUF_LIBS -lbsd"])
+
enable_libdata=true
AC_SEARCH_LIBS([libdata_init], [data],
[LIBRTBUF_LIBS="$LIBRTBUF_LIBS -ldata"
@@ -46,6 +50,8 @@ AC_SEARCH_LIBS([cli_init], [cli],
AC_MSG_ERROR([missing libcli for rtbuf])
fi])
AM_CONDITIONAL([ENABLE_CLI], [test x"$enable_cli" = x"true"])
+AC_SUBST([LIBRTBUF_CFLAGS])
+AC_SUBST([LIBRTBUF_LIBS])
PKG_CHECK_MODULES([GTK3], [gtk+-3.0],
[enable_gtk3=true],
@@ -62,7 +68,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread],
[if test x"$enable_rtbuf" = x"true"; then
AC_MSG_ERROR([missing libpthread for rtbuf])
fi])
-AC_SUBST([RTBUF_LIBS])
+
+AC_SEARCH_LIBS([dlopen], [dl],
+ [RTBUF_LIBS="$RTBUF_LIBS -ldl"])
AC_CHECK_LIB([readline], [readline],
[RTBUF_LIBS="$RTBUF_LIBS -lreadline"],
@@ -73,6 +81,7 @@ AC_CHECK_LIB([termcap], [tputs],
AC_MSG_ERROR(missing termcap library for rtbuf))
AM_CONDITIONAL([ENABLE_RTBUF], [test x"$enable_rtbuf" = x"true"])
+AC_SUBST([RTBUF_LIBS])
enable_music=true
AM_CONDITIONAL([ENABLE_MUSIC], [test x"$enable_music" = x"true"])
@@ -122,6 +131,7 @@ AC_CONFIG_FILES([Makefile])
AC_OUTPUT
echo "Building status :"
+echo " librtbuf : true $LIBRTBUF_LIBS"
echo " rtbuf-gtk : $enable_gtk3 $GTK3_LIBS"
echo " rtbuf : $enable_rtbuf $RTBUF_LIBS"
echo " signal : $enable_signal $SIGNAL_LIBS"
diff --git a/rtbuf_signal.h b/rtbuf_signal.h
index 1e81abc..c2bcf6f 100644
--- a/rtbuf_signal.h
+++ b/rtbuf_signal.h
@@ -61,10 +61,9 @@ const double g_rtbuf_signal_default_frequency;
/* delay */
-#define RTBUF_SIGNAL_DELAY_MAX 10.0
-#define RTBUF_SIGNAL_DELAY_SAMPLES_MAX ((unsigned int) \
- (RTBUF_SIGNAL_DELAY_MAX * \
- RTBUF_SIGNAL_SAMPLERATE))
+#define RTBUF_SIGNAL_DELAY_MAX 10
+#define RTBUF_SIGNAL_DELAY_SAMPLES_MAX (RTBUF_SIGNAL_DELAY_MAX * \
+ RTBUF_SIGNAL_SAMPLERATE)
#pragma pack(push,1)
typedef struct rtbuf_signal_delay_data {