diff options
| -rw-r--r-- | ares/Makefile.am | 11 | ||||
| -rw-r--r-- | ares/configure.ac | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ares/Makefile.am b/ares/Makefile.am index 821ee027f..414887053 100644 --- a/ares/Makefile.am +++ b/ares/Makefile.am @@ -8,7 +8,13 @@ MSVCFILES = vc/adig/adig.dep vc/adig/adig.dsp vc/vc.dsw vc/ahost/ahost.dep \ vc/ahost/ahost.dsp vc/areslib/areslib.dep vc/areslib/areslib.dsp \ vc/areslib/areslib.dsw -noinst_PROGRAMS = ahost adig +if DEBUGBUILD +PROGS = +else +PROGS = ahost adig acountry +endif + +noinst_PROGRAMS =$(PROGS) # adig and ahost are just sample programs and thus not mentioned with the # regular sources and headers @@ -71,6 +77,9 @@ ahost_LDADD = $(top_builddir)/$(lib_LTLIBRARIES) adig_SOURCES = adig.c ares_getopt.c adig_LDADD = $(top_builddir)/$(lib_LTLIBRARIES) +acountry_SOURCES = acountry.c ares_getopt.c +acountry_LDADD = $(top_builddir)/$(lib_LTLIBRARIES) + # Make files named *.dist replace the file without .dist extension dist-hook: find $(distdir) -name "*.dist" -exec rm {} \; diff --git a/ares/configure.ac b/ares/configure.ac index f5adf732f..7edc374b7 100644 --- a/ares/configure.ac +++ b/ares/configure.ac @@ -46,6 +46,8 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]), dnl when doing the debug stuff, use static library only AC_DISABLE_SHARED + debugbuild="yes" + dnl the entire --enable-debug is a hack that lives and runs on top of dnl libcurl stuff so this BUILDING_LIBCURL is not THAT much uglier AC_DEFINE(BUILDING_LIBCURL, 1, [when building as static part of libcurl]) @@ -70,6 +72,7 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]), esac ], AC_MSG_RESULT(no) ) +AM_CONDITIONAL(DEBUGBUILD, test x$debugbuild = xyes) dnl skip libtool C++ and Fortran compiler checks m4_ifdef([AC_PROG_CXX], [m4_undefine([AC_PROG_CXX])]) |