diff options
author | Ben Wiederhake <BenWiederhake.GitHub@gmx> | 2015-10-03 11:32:22 +0300 |
---|---|---|
committer | Ben Wiederhake <BenWiederhake.GitHub@gmx> | 2015-10-04 16:09:42 +0300 |
commit | f221cf221cd3f300dd1e7417f649600fdfb313b7 (patch) | |
tree | c742a41bbf3ca46ac48c694dff44e94d2b381b1a | |
parent | 22693cd6ff8cf54f441ac84a1b514cc2392d7771 (diff) |
Adapt to updated tl-parser.
-rw-r--r-- | Makefile.tl-parser | 2 | ||||
-rw-r--r-- | config.h.in | 3 | ||||
-rwxr-xr-x | configure | 45 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
m--------- | tl-parser | 0 |
5 files changed, 1 insertions, 50 deletions
diff --git a/Makefile.tl-parser b/Makefile.tl-parser index 9600514..44c5a8e 100644 --- a/Makefile.tl-parser +++ b/Makefile.tl-parser @@ -1,4 +1,4 @@ -TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o ${OBJ}/crc32.o +TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o ${TL_PARSER_OBJECTS}: ${OBJ}/%.o: ${srcdir}/tl-parser/%.c | create_dirs ${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tl-parser -c -MP -MD -MF ${DEP}/$*.d -MQ ${OBJ}/$*.o -o $@ $< diff --git a/config.h.in b/config.h.in index 3bfcf78..b242e93 100644 --- a/config.h.in +++ b/config.h.in @@ -33,9 +33,6 @@ /* Define to 1 if you have the `gcrypt' library (-lgcrypt). */ #undef HAVE_LIBGCRYPT -/* Define to 1 if you have the `m' library (-lm). */ -#undef HAVE_LIBM - /* Define to 1 if you have `z' library (-lz) */ #undef HAVE_LIBZ @@ -3214,51 +3214,6 @@ LDFLAGS="$LDFLAGS -L/usr/local/lib" # Checks for libraries. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 -$as_echo_n "checking for sqrt in -lm... " >&6; } -if ${ac_cv_lib_m_sqrt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sqrt (); -int -main () -{ -return sqrt (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_sqrt=yes -else - ac_cv_lib_m_sqrt=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 -$as_echo "$ac_cv_lib_m_sqrt" >&6; } -if test "x$ac_cv_lib_m_sqrt" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 $as_echo_n "checking for library containing clock_gettime... " >&6; } if ${ac_cv_search_clock_gettime+:} false; then : diff --git a/configure.ac b/configure.ac index 45c3a19..37d287e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,6 @@ CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" # Checks for libraries. -AC_CHECK_LIB([m], [sqrt]) AC_SEARCH_LIBS([clock_gettime], [rt]) EVENT_VER="" diff --git a/tl-parser b/tl-parser -Subproject 1659d87b8dfee385cc587661d592a5ade2b4171 +Subproject abb3e47a984c2cc126522c48bd9c3b60ad14a46 |