Skip to content

Commit d9d775f

Browse files
committed
Merge branch 'master2'
2 parents 543db85 + a1ab82a commit d9d775f

File tree

6 files changed

+3248
-559
lines changed

6 files changed

+3248
-559
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ stamp-h1
5555
*.libs
5656
example/server
5757

58+
/Build (GNU)/

configure.ac

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ LT_INIT
77
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
88
AC_PROG_CC
99
AM_PROG_CC_C_O
10+
AC_CONFIG_MACRO_DIRS([m4])
1011

1112
#AC_CHECK_LIB([ev], [ev_io_init],[], [AC_MSG_ERROR([libev was not found])])
1213
#AC_CHECK_LIB([ev],[ev_sleep],[],[AC_MSG_ERROR([libev was not found])])
@@ -17,7 +18,7 @@ AC_ARG_WITH([libev],
1718
[AS_HELP_STRING([--with-libev@<:@=PATH@:>@],[Search for libev in PATH/include and PATH/lib])],
1819
[WITH_LIBEV=$withval],[WITH_LIBEV=yes])
1920

20-
LIBEV_CFLAGS=""
21+
LIBEV_CFLAGS="-lm"
2122
LIBEV_LIBS=""
2223

2324
PKG_CHECK_MODULES([LIBEV], [libev], [], [
@@ -42,6 +43,11 @@ PKG_CHECK_MODULES([LIBEV], [libev], [], [
4243
AC_SUBST([LIBEV_CFLAGS])
4344
AC_SUBST([LIBEV_LIBS])
4445

46+
AC_MSG_RESULT([
47+
LIBEV_CFLAGS: ${LIBEV_CFLAGS}
48+
LIBEV_LIBS: ${LIBEV_LIBS}
49+
])
50+
4551
AC_CONFIG_HEADERS([config.h])
4652
AC_CONFIG_FILES([
4753
Makefile

0 commit comments

Comments
 (0)