interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't prefix extension libraries names from /src

This commit is contained in:
Willem Toorop 2014-11-07 07:26:09 +01:00
parent d7300c17f8
commit 3c9b0c2e30
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -11713,7 +11713,7 @@ fi
fi fi
if test x_$have_libevent = x_1; then : if test x_$have_libevent = x_1; then :
EXTENSION_LIBEVENT_LIB="../libgetdns_ext_event.la" EXTENSION_LIBEVENT_LIB="libgetdns_ext_event.la"
CHECK_EVENT_PROG=check_getdns_event CHECK_EVENT_PROG=check_getdns_event
# libunbound version 1.4.22 and older, not linked against libevent, on FreeBSD, # libunbound version 1.4.22 and older, not linked against libevent, on FreeBSD,
# ============================================================================= # =============================================================================
@ -11931,7 +11931,7 @@ fi
fi fi
if test x_$have_libuv = x_1; then : if test x_$have_libuv = x_1; then :
EXTENSION_LIBUV_LIB="../libgetdns_ext_uv.la" EXTENSION_LIBUV_LIB="libgetdns_ext_uv.la"
CHECK_UV_PROG=check_getdns_uv CHECK_UV_PROG=check_getdns_uv
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for new signature of uv_timer_cb" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new signature of uv_timer_cb" >&5
$as_echo_n "checking for new signature of uv_timer_cb... " >&6; } $as_echo_n "checking for new signature of uv_timer_cb... " >&6; }
@ -12112,7 +12112,7 @@ fi
fi fi
if test x_$have_libev = x_1; then : if test x_$have_libev = x_1; then :
EXTENSION_LIBEV_LIB="../libgetdns_ext_ev.la" EXTENSION_LIBEV_LIB="libgetdns_ext_ev.la"
CHECK_EV_PROG=check_getdns_ev CHECK_EV_PROG=check_getdns_ev
fi fi

6
configure.ac
View File

@ -296,7 +296,7 @@ AS_IF([test x_$withval = x_no],
) )
AS_IF([test x_$have_libevent = x_1], AS_IF([test x_$have_libevent = x_1],
[EXTENSION_LIBEVENT_LIB="../libgetdns_ext_event.la"] [EXTENSION_LIBEVENT_LIB="libgetdns_ext_event.la"]
[CHECK_EVENT_PROG=check_getdns_event] [CHECK_EVENT_PROG=check_getdns_event]
# libunbound version 1.4.22 and older, not linked against libevent, on FreeBSD, # libunbound version 1.4.22 and older, not linked against libevent, on FreeBSD,
# ============================================================================= # =============================================================================
@ -382,7 +382,7 @@ AS_IF([test x_$withval = x_no],
) )
AS_IF([test x_$have_libuv = x_1], AS_IF([test x_$have_libuv = x_1],
[EXTENSION_LIBUV_LIB="../libgetdns_ext_uv.la"] [EXTENSION_LIBUV_LIB="libgetdns_ext_uv.la"]
[CHECK_UV_PROG=check_getdns_uv] [CHECK_UV_PROG=check_getdns_uv]
[AC_MSG_CHECKING([for new signature of uv_timer_cb]) [AC_MSG_CHECKING([for new signature of uv_timer_cb])
AC_LANG_PUSH(C) AC_LANG_PUSH(C)
@ -447,7 +447,7 @@ AS_IF([test x_$withval = x_no],
) )
AS_IF([test x_$have_libev = x_1], AS_IF([test x_$have_libev = x_1],
[EXTENSION_LIBEV_LIB="../libgetdns_ext_ev.la"] [EXTENSION_LIBEV_LIB="libgetdns_ext_ev.la"]
[CHECK_EV_PROG=check_getdns_ev]) [CHECK_EV_PROG=check_getdns_ev])
AC_SUBST(have_libev) AC_SUBST(have_libev)

15
src/test/Makefile.in
View File

@ -47,13 +47,10 @@ NOLIBCHECK = @NOLIBCHECK@
EXTENSION_LIBEVENT_EXT_LIBS=@EXTENSION_LIBEVENT_EXT_LIBS@ EXTENSION_LIBEVENT_EXT_LIBS=@EXTENSION_LIBEVENT_EXT_LIBS@
EXTENSION_LIBEVENT_LDFLAGS=@EXTENSION_LIBEVENT_LDFLAGS@ EXTENSION_LIBEVENT_LDFLAGS=@EXTENSION_LIBEVENT_LDFLAGS@
EXTENSION_LIBEVENT_LIB=@EXTENSION_LIBEVENT_LIB@
EXTENSION_LIBUV_EXT_LIBS=@EXTENSION_LIBUV_EXT_LIBS@ EXTENSION_LIBUV_EXT_LIBS=@EXTENSION_LIBUV_EXT_LIBS@
EXTENSION_LIBUV_LDFLAGS=@EXTENSION_LIBUV_LDFLAGS@ EXTENSION_LIBUV_LDFLAGS=@EXTENSION_LIBUV_LDFLAGS@
EXTENSION_LIBUV_LIB=@EXTENSION_LIBUV_LIB@
EXTENSION_LIBEV_EXT_LIBS=@EXTENSION_LIBEV_EXT_LIBS@ EXTENSION_LIBEV_EXT_LIBS=@EXTENSION_LIBEV_EXT_LIBS@
EXTENSION_LIBEV_LDFLAGS=@EXTENSION_LIBEV_LDFLAGS@ EXTENSION_LIBEV_LDFLAGS=@EXTENSION_LIBEV_LDFLAGS@
EXTENSION_LIBEV_LIB=@EXTENSION_LIBEV_LIB@
CHECK_GETDNS=@CHECK_GETDNS@ CHECK_GETDNS=@CHECK_GETDNS@
CHECK_UV_PROG=@CHECK_UV_PROG@ CHECK_UV_PROG=@CHECK_UV_PROG@
@ -105,14 +102,14 @@ check_getdns_common: check_getdns_common.lo
check_getdns: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_selectloop.lo check_getdns: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_selectloop.lo
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_selectloop.lo $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_selectloop.lo
check_getdns_event: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libevent.lo check_getdns_event: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libevent.lo ../libgetdns_ext_event.la
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libevent.lo $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) $(EXTENSION_LIBEVENT_LIB) $(EXTENSION_LIBEVENT_LDFLAGS) $(EXTENSION_LIBEVENT_EXT_LIBS) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libevent.lo $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) ../libgetdns_ext_event.la $(EXTENSION_LIBEVENT_LDFLAGS) $(EXTENSION_LIBEVENT_EXT_LIBS)
check_getdns_uv: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libuv.lo check_getdns_uv: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libuv.lo ../libgetdns_ext_uv.la
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libuv.lo $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) $(EXTENSION_LIBUV_LIB) $(EXTENSION_LIBUV_LDFLAGS) $(EXTENSION_LIBUV_EXT_LIBS) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libuv.lo $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) ../libgetdns_ext_uv.la $(EXTENSION_LIBUV_LDFLAGS) $(EXTENSION_LIBUV_EXT_LIBS)
check_getdns_ev: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libev.lo check_getdns_ev: check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libev.lo ../libgetdns_ext_ev.la
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libev.lo $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) $(EXTENSION_LIBEV_LIB) $(EXTENSION_LIBEV_LDFLAGS) $(EXTENSION_LIBEV_EXT_LIBS) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ check_getdns.lo check_getdns_common.lo check_getdns_context_set_timeout.lo check_getdns_transport.lo check_getdns_libev.lo $(LDFLAGS) $(LDLIBS) $(LIBCHECK_LDFLAGS) $(LIBCHECK_LIBS) ../libgetdns_ext_ev.la $(EXTENSION_LIBEV_LDFLAGS) $(EXTENSION_LIBEV_EXT_LIBS)
getdns_query: getdns_query.lo getdns_query: getdns_query.lo
$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ getdns_query.lo $(LDFLAGS) $(LDLIBS) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ getdns_query.lo $(LDFLAGS) $(LDLIBS)