From 8036639f91f39e0284f7464c362d082024b03c3d Mon Sep 17 00:00:00 2001 From: Glen Wiley Date: Thu, 6 Mar 2014 11:43:18 -0500 Subject: [PATCH] do not build libev/uv/event extensions by default, handle --with/without --- ChangeLog | 3 + Makefile.in | 1 + configure | 205 ++++++++++++++++++++++++++++++++---------------- configure.ac | 173 ++++++++++++++++++++++++++-------------- src/Makefile.in | 14 ++-- src/config.h.in | 6 -- 6 files changed, 264 insertions(+), 138 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ee6a3bd..010de618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ * 2014-xx-xx : Version x.x.x + * default to NOT build extensions (libev, libuv, libevent), handle + --with/--without optiosn to configure for them + * respect configure --docdir=X * Documentation/man page updates * 2014-02-25 : Version 0.1.0 diff --git a/Makefile.in b/Makefile.in index 9a18632a..9ee9eaec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,6 +35,7 @@ distdir = $(tarname)-$(version) bintar = $(distdir)-bin.tar.gz prefix = @prefix@ +datarootdir=@datarootdir@ exec_prefix = @exec_prefix@ bindir = @bindir@ docdir = @docdir@ diff --git a/configure b/configure index 70340379..64ee2b6a 100755 --- a/configure +++ b/configure @@ -635,16 +635,18 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS TRUST_ANCHOR_FILE -EXTENSION_LDFLAGS CHECK_EV_PROG +EXTENSION_LIBEV_LDFLAGS EXTENSION_LIBEV_EXT_LIBS EXTENSION_LIBEV_LIB have_libev CHECK_UV_PROG +EXTENSION_LIBUV_LDFLAGS EXTENSION_LIBUV_EXT_LIBS EXTENSION_LIBUV_LIB have_libuv CHECK_EVENT_PROG +EXTENSION_LIBEVENT_LDFLAGS EXTENSION_LIBEVENT_EXT_LIBS EXTENSION_LIBEVENT_LIB have_libevent @@ -745,6 +747,9 @@ enable_rpath with_libidn with_libldns with_libunbound +with_libevent +with_libuv +with_libev with_trust_anchor ' ac_precious_vars='build_alias @@ -1388,6 +1393,9 @@ Optional Packages: --with-libldns=pathname path to libldns (default: search /usr/local ..) --with-libunbound=pathname path to libunbound (default: search /usr/local ..) + --with-libevent path to libevent (default: search /usr/local ..) + --with-libuv path to libuv (default: search /usr/local ..) + --with-libev path to libev (default: search /usr/local ..) --with-trust-anchor=KEYFILE Default location of the trust anchor file. [default=SYSCONFDIR/unbound/getdns-root.key] @@ -11170,14 +11178,26 @@ _ACEOF getdns_LIBS=$LIBS getdns_LDFLAGS=$LDFLAGS -EXTENSION_LDFLAGS=$LDFLAGS +#-------------------- libevent extension + +# Check whether --with-libevent was given. +if test "${with_libevent+set}" = set; then : + withval=$with_libevent; with_libevent=search +else + withval=no +fi + -# libevent extension have_libevent=0 -EXTENSION_LIBEVENT_LIB="libgetdns_ext_event.la" EXTENSION_LIBEVENT_EXT_LIBS="" +EXTENSION_LIBEVENT_LIB="" +EXTENSION_LIBEVENT_LDFLAGS="" CHECK_EVENT_PROG="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_loop" >&5 +if test x_$withval = x_no; then : + +else + if test x_$withval = x_yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing event_loop" >&5 $as_echo_n "checking for library containing event_loop... " >&6; } if ${ac_cv_search_event_loop+:} false; then : $as_echo_n "(cached) " >&6 @@ -11242,7 +11262,7 @@ _ACEOF fi done - for ac_header in event2/event.h + for ac_header in event2/event.h do : ac_fn_c_check_header_compile "$LINENO" "event2/event.h" "ac_cv_header_event2_event_h" "$ac_includes_default " @@ -11250,51 +11270,34 @@ if test "x$ac_cv_header_event2_event_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_EVENT2_EVENT_H 1 _ACEOF - # event2/event.h found - have_libevent=1 - EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop" - CHECK_EVENT_PROG=check_getdns_event + have_libevent=1 + EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop" else - # not found - look for event.h - ac_fn_c_check_type "$LINENO" "u_char" "ac_cv_type_u_char" "$ac_includes_default" -if test "x$ac_cv_type_u_char" = xyes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define u_char unsigned char -_ACEOF - -fi - - for ac_header in event.h -do : - ac_fn_c_check_header_compile "$LINENO" "event.h" "ac_cv_header_event_h" "$ac_includes_default -" -if test "x$ac_cv_header_event_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_EVENT_H 1 -_ACEOF - # found - have_libevent=1 - EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop" - CHECK_EVENT_PROG=check_getdns_event -else - # not found - give up - EXTENSION_LIBEVENT_LIB="" -fi - -done - - + as_fn_error $? "event2/event.h missing, try without libevent" "$LINENO" 5 + have_libevent=0 fi done else - # libs not found - have_libevent=0 - EXTENSION_LIBEVENT_LIB="" + as_fn_error $? "libevent missing, try without libevent" "$LINENO" 5 + +fi + +else + have_libevent=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: assuming libevent in $withval" >&5 +$as_echo "$as_me: assuming libevent in $withval" >&6;} + CFLAGS="$CFLAGS -I$withval/include" + EXTENSION_LIBEVENT_LDFLAGS="-L$withval/lib" + EXTENSION_LIBEVENT_EXT_LIBS="-levent" +fi + +fi + +if test x_$have_libevent = x_1; then : + EXTENSION_LIBEVENT_LIB="libgetdns_ext_event.la" + CHECK_EVENT_PROG=check_getdns_event fi @@ -11303,12 +11306,32 @@ fi -# libuv extension -have_libuv=1 -EXTENSION_LIBUV_LIB="libgetdns_ext_uv.la" +# end libevent extension + +#-------------------- libuv extension +# if user says nothing about libuv, or specifies --with-libuv=no or --without-libuv +# then we do not want libuv extensions built +# if user specifies --with-libuv then search for it +# if user specifies --with-libuv=/path then check the lib at that path + +# Check whether --with-libuv was given. +if test "${with_libuv+set}" = set; then : + withval=$with_libuv; with_libuv=search +else + withval=no +fi + + +have_libuv=0 EXTENSION_LIBUV_EXT_LIBS="" +EXTENSION_LIBUV_LIB="" +EXTENSION_LIBUV_LDFLAGS="" CHECK_UV_PROG="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uv_run" >&5 +if test x_$withval = x_no; then : + +else + if test x_$withval = x_yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uv_run" >&5 $as_echo_n "checking for library containing uv_run... " >&6; } if ${ac_cv_search_uv_run+:} false; then : $as_echo_n "(cached) " >&6 @@ -11369,18 +11392,34 @@ if test "x$ac_cv_header_uv_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_UV_H 1 _ACEOF - EXTENSION_LIBUV_EXT_LIBS="$ac_cv_search_uv_run" - CHECK_UV_PROG=check_getdns_uv + have_libuv=1 + EXTENSION_LIBUV_EXT_LIBS="$ac_cv_search_uv_run" else - have_libuv=0 - EXTENSION_LIBUV_LIB="" + as_fn_error $? "uv.h missing, try without libuv" "$LINENO" 5 + have_libuv=0 fi done else - have_libuv=0 - EXTENSION_LIBUV_LIB="" + as_fn_error $? "libuv missing, try without libuv" "$LINENO" 5 + +fi + +else + have_libuv=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: assuming libuv in $withval" >&5 +$as_echo "$as_me: assuming libuv in $withval" >&6;} + CFLAGS="$CFLAGS -I$withval/include" + EXTENSION_LIBUV_LDFLAGS="-L$withval/lib" + EXTENSION_LIBUV_EXT_LIBS="-luv" +fi + +fi + +if test x_$have_libuv = x_1; then : + EXTENSION_LIBUV_LIB="libgetdns_ext_uv.la" + CHECK_UV_PROG=check_getdns_uv fi @@ -11389,12 +11428,28 @@ fi -# libev extension -have_libev=1 -EXTENSION_LIBEV_LIB="libgetdns_ext_ev.la" -EXTENSION_LIBEV_EXT_LIBS="" +# end libuv extension -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ev_run" >&5 +#-------------------- libev extension + +# Check whether --with-libev was given. +if test "${with_libev+set}" = set; then : + withval=$with_libev; with_libev=search +else + withval=no +fi + + +have_libev=0 +EXTENSION_LIBEV_EXT_LIBS="" +EXTENSION_LIBEV_LIB="" +EXTENSION_LIBEV_LDFLAGS="" +CHECK_EV_PROG="" +if test x_$withval = x_no; then : + +else + if test x_$withval = x_yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ev_run" >&5 $as_echo_n "checking for library containing ev_run... " >&6; } if ${ac_cv_search_ev_run+:} false; then : $as_echo_n "(cached) " >&6 @@ -11455,18 +11510,34 @@ if test "x$ac_cv_header_ev_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_EV_H 1 _ACEOF - EXTENSION_LIBEV_EXT_LIBS="$ac_cv_search_ev_run" - CHECK_EV_PROG=check_getdns_ev + have_libev=1 + EXTENSION_LIBEV_EXT_LIBS="$ac_cv_search_ev_run" else - have_libev=0 - EXTENSION_LIBUV_LIB="" + as_fn_error $? "ev.h missing, try without libev" "$LINENO" 5 + have_libev=0 fi done else - have_libev=0 - EXTENSION_LIBEV_LIB="" + as_fn_error $? "libev missing, try without libev" "$LINENO" 5 + +fi + +else + have_libev=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: assuming libev in $withval" >&5 +$as_echo "$as_me: assuming libev in $withval" >&6;} + CFLAGS="$CFLAGS -I$withval/include" + EXTENSION_LIBEV_LDFLAGS="-L$withval/lib" + EXTENSION_LIBEV_EXT_LIBS="-lev" +fi + +fi + +if test x_$have_libev = x_1; then : + EXTENSION_LIBEV_LIB="libgetdns_ext_ev.la" + CHECK_EV_PROG=check_getdns_ev fi @@ -11475,7 +11546,7 @@ fi - +# end libev extension LIBS=$getdns_LIBS LDFLAGS=$getdns_LDFLAGS diff --git a/configure.ac b/configure.ac index 970ea5b7..97b3cd3e 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ ACX_ARG_RPATH # search to set include and library paths right # find libidn -AC_ARG_WITH(libidn, AC_HELP_STRING([--with-libidn=pathname], +AC_ARG_WITH(libidn, AS_HELP_STRING([--with-libidn=pathname], [path to libidn (default: search /usr/local ..)]), [], [withval="yes"]) if test x_$withval = x_yes; then @@ -114,7 +114,7 @@ else fi # find libldns -AC_ARG_WITH(libldns, AC_HELP_STRING([--with-libldns=pathname], +AC_ARG_WITH(libldns, AS_HELP_STRING([--with-libldns=pathname], [path to libldns (default: search /usr/local ..)]), [], [withval="yes"]) if test x_$withval = x_yes; then @@ -134,7 +134,7 @@ else fi # find libunbound -AC_ARG_WITH(libunbound, AC_HELP_STRING([--with-libunbound=pathname], +AC_ARG_WITH(libunbound, AS_HELP_STRING([--with-libunbound=pathname], [path to libunbound (default: search /usr/local ..)]), [], [withval="yes"]) if test x_$withval = x_yes; then @@ -175,9 +175,9 @@ then AC_MSG_ERROR([libunbound is missing.]) fi -AC_CHECK_PROGS([DOXYGEN], [doxygen]) +AC_CHECK_PROG([DOXYGEN], [doxygen]) if test -z "$DOXYGEN"; - then AC_MSG_WARN([Doxygen not found, continuing without]) + then AC_MSG_WARN([doxygen not found, continuing without]) fi # Checks for header files. @@ -193,91 +193,146 @@ AC_TYPE_UINT8_T getdns_LIBS=$LIBS getdns_LDFLAGS=$LDFLAGS -EXTENSION_LDFLAGS=$LDFLAGS +#-------------------- libevent extension +AC_ARG_WITH([libevent], + [AS_HELP_STRING([--with-libevent], [path to libevent (default: search /usr/local ..)])], + [with_libevent=search], + [withval=no]) -# libevent extension have_libevent=0 -EXTENSION_LIBEVENT_LIB="libgetdns_ext_event.la" EXTENSION_LIBEVENT_EXT_LIBS="" +EXTENSION_LIBEVENT_LIB="" +EXTENSION_LIBEVENT_LDFLAGS="" CHECK_EVENT_PROG="" -AC_SEARCH_LIBS([event_loop], - [event_core event], - [AC_CHECK_FUNCS([event_base_new event_base_free])] - [AC_CHECK_HEADERS([event2/event.h], - # event2/event.h found - [have_libevent=1] - [EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"] - [CHECK_EVENT_PROG=check_getdns_event], - # not found - look for event.h - [AC_CHECK_TYPE(u_char, unsigned char)] - [AC_CHECK_HEADERS([event.h], - # found - [have_libevent=1] - [EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"] - [CHECK_EVENT_PROG=check_getdns_event], - # not found - give up - [EXTENSION_LIBEVENT_LIB=""], - [AC_INCLUDES_DEFAULT])] - ,[AC_INCLUDES_DEFAULT])], - # libs not found - [have_libevent=0] - [EXTENSION_LIBEVENT_LIB=""]) +AS_IF([test x_$withval = x_no], + [], + [AS_IF([test x_$withval = x_yes], + [AC_SEARCH_LIBS([event_loop], + [event_core event], + [AC_CHECK_FUNCS([event_base_new event_base_free])] + [AC_CHECK_HEADERS([event2/event.h], + [have_libevent=1] + [EXTENSION_LIBEVENT_EXT_LIBS="$ac_cv_search_event_loop"], + [AC_MSG_ERROR([event2/event.h missing, try without libevent])] + [have_libevent=0], + [AC_INCLUDES_DEFAULT])], + [AC_MSG_ERROR([libevent missing, try without libevent])] + )], + [have_libevent=1] + [AC_MSG_NOTICE([assuming libevent in $withval])] + [CFLAGS="$CFLAGS -I$withval/include"] + [EXTENSION_LIBEVENT_LDFLAGS="-L$withval/lib"] + [EXTENSION_LIBEVENT_EXT_LIBS="-levent"])] + ) + +AS_IF([test x_$have_libevent = x_1], + [EXTENSION_LIBEVENT_LIB="libgetdns_ext_event.la"] + [CHECK_EVENT_PROG=check_getdns_event]) AC_SUBST(have_libevent) AC_SUBST(EXTENSION_LIBEVENT_LIB) AC_SUBST(EXTENSION_LIBEVENT_EXT_LIBS) +AC_SUBST(EXTENSION_LIBEVENT_LDFLAGS) AC_SUBST(CHECK_EVENT_PROG) -# libuv extension -have_libuv=1 -EXTENSION_LIBUV_LIB="libgetdns_ext_uv.la" +# end libevent extension + +#-------------------- libuv extension +# if user says nothing about libuv, or specifies --with-libuv=no or --without-libuv +# then we do not want libuv extensions built +# if user specifies --with-libuv then search for it +# if user specifies --with-libuv=/path then check the lib at that path +AC_ARG_WITH([libuv], + [AS_HELP_STRING([--with-libuv], [path to libuv (default: search /usr/local ..)])], + [with_libuv=search], + [withval=no]) + +have_libuv=0 EXTENSION_LIBUV_EXT_LIBS="" +EXTENSION_LIBUV_LIB="" +EXTENSION_LIBUV_LDFLAGS="" CHECK_UV_PROG="" -AC_SEARCH_LIBS([uv_run], - [uv], - [AC_CHECK_HEADERS([uv.h], - [EXTENSION_LIBUV_EXT_LIBS="$ac_cv_search_uv_run"] - [CHECK_UV_PROG=check_getdns_uv], - [have_libuv=0] - [EXTENSION_LIBUV_LIB=""], - [AC_INCLUDES_DEFAULT])], - [have_libuv=0] - [EXTENSION_LIBUV_LIB=""]) +AS_IF([test x_$withval = x_no], + [], + [AS_IF([test x_$withval = x_yes], + [AC_SEARCH_LIBS([uv_run], + [uv], + [AC_CHECK_HEADERS([uv.h], + [have_libuv=1] + [EXTENSION_LIBUV_EXT_LIBS="$ac_cv_search_uv_run"], + [AC_MSG_ERROR([uv.h missing, try without libuv])] + [have_libuv=0], + [AC_INCLUDES_DEFAULT])], + [AC_MSG_ERROR([libuv missing, try without libuv])] + )], + [have_libuv=1] + [AC_MSG_NOTICE([assuming libuv in $withval])] + [CFLAGS="$CFLAGS -I$withval/include"] + [EXTENSION_LIBUV_LDFLAGS="-L$withval/lib"] + [EXTENSION_LIBUV_EXT_LIBS="-luv"])] + ) + +AS_IF([test x_$have_libuv = x_1], + [EXTENSION_LIBUV_LIB="libgetdns_ext_uv.la"] + [CHECK_UV_PROG=check_getdns_uv]) AC_SUBST(have_libuv) AC_SUBST(EXTENSION_LIBUV_LIB) AC_SUBST(EXTENSION_LIBUV_EXT_LIBS) +AC_SUBST(EXTENSION_LIBUV_LDFLAGS) AC_SUBST(CHECK_UV_PROG) -# libev extension -have_libev=1 -EXTENSION_LIBEV_LIB="libgetdns_ext_ev.la" -EXTENSION_LIBEV_EXT_LIBS="" +# end libuv extension -AC_SEARCH_LIBS([ev_run], - [ev], - [AC_CHECK_HEADERS([ev.h], - [EXTENSION_LIBEV_EXT_LIBS="$ac_cv_search_ev_run"] - [CHECK_EV_PROG=check_getdns_ev], - [have_libev=0] - [EXTENSION_LIBUV_LIB=""], - [AC_INCLUDES_DEFAULT])], - [have_libev=0] - [EXTENSION_LIBEV_LIB=""]) +#-------------------- libev extension +AC_ARG_WITH([libev], + [AS_HELP_STRING([--with-libev], [path to libev (default: search /usr/local ..)])], + [with_libev=search], + [withval=no]) + +have_libev=0 +EXTENSION_LIBEV_EXT_LIBS="" +EXTENSION_LIBEV_LIB="" +EXTENSION_LIBEV_LDFLAGS="" +CHECK_EV_PROG="" +AS_IF([test x_$withval = x_no], + [], + [AS_IF([test x_$withval = x_yes], + [AC_SEARCH_LIBS([ev_run], + [ev], + [AC_CHECK_HEADERS([ev.h], + [have_libev=1] + [EXTENSION_LIBEV_EXT_LIBS="$ac_cv_search_ev_run"], + [AC_MSG_ERROR([ev.h missing, try without libev])] + [have_libev=0], + [AC_INCLUDES_DEFAULT])], + [AC_MSG_ERROR([libev missing, try without libev])] + )], + [have_libev=1] + [AC_MSG_NOTICE([assuming libev in $withval])] + [CFLAGS="$CFLAGS -I$withval/include"] + [EXTENSION_LIBEV_LDFLAGS="-L$withval/lib"] + [EXTENSION_LIBEV_EXT_LIBS="-lev"])] + ) + +AS_IF([test x_$have_libev = x_1], + [EXTENSION_LIBEV_LIB="libgetdns_ext_ev.la"] + [CHECK_EV_PROG=check_getdns_ev]) AC_SUBST(have_libev) AC_SUBST(EXTENSION_LIBEV_LIB) AC_SUBST(EXTENSION_LIBEV_EXT_LIBS) +AC_SUBST(EXTENSION_LIBEV_LDFLAGS) AC_SUBST(CHECK_EV_PROG) -AC_SUBST(EXTENSION_LDFLAGS) +# end libev extension LIBS=$getdns_LIBS LDFLAGS=$getdns_LDFLAGS # --with-trust-anchor= AC_DEFINE([SYSCONFDIR], [sysconfdir], [System configuration dir]) -AC_ARG_WITH(trust-anchor, AC_HELP_STRING([--with-trust-anchor=KEYFILE], [Default location of the trust anchor file. [default=SYSCONFDIR/unbound/getdns-root.key]]), [ +AC_ARG_WITH(trust-anchor, AS_HELP_STRING([--with-trust-anchor=KEYFILE], [Default location of the trust anchor file. [default=SYSCONFDIR/unbound/getdns-root.key]]), [ TRUST_ANCHOR_FILE="$withval" ],[ if test "x$TRUST_ANCHOR_FILE" = "x"; then diff --git a/src/Makefile.in b/src/Makefile.in index c4681173..7e1066ed 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -59,13 +59,15 @@ CC=@CC@ CFLAGS=@CFLAGS@ -Wall -I$(srcdir)/ -I/usr/local/include -std=c99 LDFLAGS=@LDFLAGS@ @LIBS@ -EXTENSION_LDFLAGS=@EXTENSION_LDFLAGS@ EXTENSION_LIBEVENT_LIB=@EXTENSION_LIBEVENT_LIB@ EXTENSION_LIBEVENT_EXT_LIBS=@EXTENSION_LIBEVENT_EXT_LIBS@ -EXTENSION_LIBUV_LIB=@EXTENSION_LIBUV_LIB@ -EXTENSION_LIBUV_EXT_LIBS=@EXTENSION_LIBUV_EXT_LIBS@ +EXTENSION_LIBEVENT_LDFLAGS=@EXTENSION_LIBEVENT_LDFLAGS@ EXTENSION_LIBEV_LIB=@EXTENSION_LIBEV_LIB@ EXTENSION_LIBEV_EXT_LIBS=@EXTENSION_LIBEV_EXT_LIBS@ +EXTENSION_LIBEV_LDFLAGS=@EXTENSION_LIBEV_LDFLAGS@ +EXTENSION_LIBUV_LIB=@EXTENSION_LIBUV_LIB@ +EXTENSION_LIBUV_EXT_LIBS=@EXTENSION_LIBUV_EXT_LIBS@ +EXTENSION_LIBUV_LDFLAGS=@EXTENSION_LIBUV_LDFLAGS@ GETDNS_OBJ=sync.lo context.lo list.lo dict.lo convert.lo general.lo \ hostname.lo service.lo request-internal.lo util-internal.lo \ @@ -101,13 +103,13 @@ uninstall: $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libgetdns.la $(DESTDIR)$(libdir)/$(EXTENSION_LIBEVENT_LIB) $(DESTDIR)$(libdir)/$(EXTENSION_LIBUV_LIB) $(DESTDIR)$(libdir)/$(EXTENSION_LIBEV_LIB) libgetdns_ext_event.la: libgetdns.la extension/libevent.lo - $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libevent.lo ./.libs/libgetdns.la $(EXTENSION_LDFLAGS) $(EXTENSION_LIBEVENT_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libevent.lo ./.libs/libgetdns.la $(EXTENSION_LIBEVENT_LDFLAGS) $(EXTENSION_LIBEVENT_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) libgetdns_ext_uv.la: libgetdns.la extension/libuv.lo - $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libuv.lo ./.libs/libgetdns.la $(EXTENSION_LDFLAGS) $(EXTENSION_LIBUV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libuv.lo ./.libs/libgetdns.la $(EXTENSION_LIBUV_LDFLAGS) $(EXTENSION_LIBUV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) libgetdns_ext_ev.la: libgetdns.la extension/libev.lo - $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libev.lo ./.libs/libgetdns.la $(EXTENSION_LDFLAGS) $(EXTENSION_LIBEV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ extension/libev.lo ./.libs/libgetdns.la $(EXTENSION_LIBEV_LDFLAGS) $(EXTENSION_LIBEV_EXT_LIBS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) libgetdns.la: $(GETDNS_OBJ) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(GETDNS_OBJ) $(LDFLAGS) -rpath $(libdir) -version-info $(libversion) -no-undefined -release $(version) diff --git a/src/config.h.in b/src/config.h.in index c6fee80b..16cca3aa 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -12,9 +12,6 @@ /* Define to 1 if you have the `event_base_new' function. */ #undef HAVE_EVENT_BASE_NEW -/* Define to 1 if you have the header file. */ -#undef HAVE_EVENT_H - /* Define to 1 if you have the header file. */ #undef HAVE_EV_H @@ -109,9 +106,6 @@ /* Define to `unsigned int' if does not define. */ #undef size_t -/* Define to `unsigned char' if does not define. */ -#undef u_char - /* Define to the type of an unsigned integer type of width exactly 16 bits if such a type exists and the standard includes do not define it. */ #undef uint16_t