Index: ettercap-NG-0.7.3/configure.in =================================================================== --- ettercap-NG-0.7.3.orig/configure.in +++ ettercap-NG-0.7.3/configure.in @@ -20,7 +20,7 @@ dnl dnl $Id: ettercap-0.7.3-autotools.patch,v 1.1 2010/12/01 06:04:16 flameeyes Exp $ dnl -AC_INIT +AC_INIT(ettercap, 0.7.3) AC_CONFIG_SRCDIR([include/ec.h]) dnl Force autoconf 2.57 @@ -32,16 +32,8 @@ dnl AM_INIT_AUTOMAKE(1.7.0) dnl Do not recompile configure Makefile et similia AM_MAINTAINER_MODE -VERSION=`grep EC_VERSION\ ./include/ec_version.h | cut -f2 -d"\""` -SB=`./shtool echo -n -e %B` -EB=`./shtool echo -n -e %b` -AC_SUBST(SB) -AC_SUBST(EB) -AC_SUBST(VERSION) -EC_MESSAGE(Configuring ettercap $VERSION) - AC_CONFIG_SRCDIR(src) -AM_INIT_AUTOMAKE(ettercap, $VERSION) +AM_INIT_AUTOMAKE([subdir-objects]) AC_CONFIG_HEADERS([include/config.h]) dnl AC_CONFIG_HEADERS(include/config.h) @@ -282,29 +274,18 @@ EC_MESSAGE(Checking for missing function AC_CONFIG_LIBOBJ_DIR(src/missing) -AM_CONDITIONAL(MISSING_STRLCPY, false) -AM_CONDITIONAL(MISSING_STRLCAT, false) -AM_CONDITIONAL(MISSING_STRSEP, false) -AM_CONDITIONAL(MISSING_MEMMEM, false) -AM_CONDITIONAL(MISSING_MEMCMP, false) -AM_CONDITIONAL(MISSING_BASENAME, false) -AM_CONDITIONAL(MISSING_GETOPT_LONG, false) -AM_CONDITIONAL(MISSING_STRCASESTR, false) -AM_CONDITIONAL(MISSING_INET_ATON, false) -AM_CONDITIONAL(MISSING_SCANDIR, false) - dnl AC_REPLACE_FUNCS(strlcpy) -AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(missing/strlcpy) AM_CONDITIONAL(MISSING_STRLCPY, true)]) -AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(missing/strlcat) AM_CONDITIONAL(MISSING_STRLCAT, true)]) -AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(missing/strsep) AM_CONDITIONAL(MISSING_STRSEP, true)]) -AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(missing/memmem) AM_CONDITIONAL(MISSING_MEMMEM, true)]) -AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(missing/memcmp) AM_CONDITIONAL(MISSING_MEMCMP, true)]) -AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(missing/basename) AM_CONDITIONAL(MISSING_BASENAME, true)]) -AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(missing/getopt) AM_CONDITIONAL(MISSING_GETOPT_LONG, true)]) -AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(missing/strcasestr) AM_CONDITIONAL(MISSING_STRCASESTR, true)]) -AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(missing/scandir) AM_CONDITIONAL(MISSING_SCANDIR, true)]) -AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(missing/inet_aton) AM_CONDITIONAL(MISSING_INET_ATON, true)]) +AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(strlcpy)]) +AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(strlcat)]) +AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(strsep)]) +AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(memmem)]) +AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(memcmp)]) +AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(basename)]) +AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(getopt)]) +AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(strcasestr)]) +AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(scandir)]) +AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(inet_aton)]) AC_CHECK_LIB(resolv, inet_aton, AM_CONDITIONAL(INET_ATON_WANTS_RESOLV, true), Index: ettercap-NG-0.7.3/utils/etterlog/Makefile.am =================================================================== --- ettercap-NG-0.7.3.orig/utils/etterlog/Makefile.am +++ ettercap-NG-0.7.3/utils/etterlog/Makefile.am @@ -30,32 +30,10 @@ etterlog_SOURCES = el_analyze.c \ $(top_srcdir)/src/ec_passive.c \ $(top_srcdir)/src/ec_strings.c \ $(top_srcdir)/src/ec_format.c - -if MISSING_STRSEP - etterlog_SOURCES += $(top_srcdir)/src/missing/strsep.c -endif -if MISSING_STRLCAT - etterlog_SOURCES += $(top_srcdir)/src/missing/strlcat.c -endif -if MISSING_STRCASESTR - etterlog_SOURCES += $(top_srcdir)/src/missing/strcasestr.c -endif -if MISSING_MEMMEM - etterlog_SOURCES += $(top_srcdir)/src/missing/memmem.c -endif -if MISSING_BASENAME - etterlog_SOURCES += $(top_srcdir)/src/missing/basename.c -endif -if MISSING_INET_ATON - etterlog_SOURCES += $(top_srcdir)/src/missing/inet_aton.c -endif -if MISSING_GETOPT_LONG - etterlog_SOURCES += $(top_srcdir)/src/missing/getopt.c -endif etterlog_CFLAGS = @EC_CFLAGS@ -etterlog_LDADD = -lz @ICONVLIB@ +etterlog_LDADD = -lz @ICONVLIB@ @LIBOBJS@ if INET_ATON_WANTS_RESOLV etterlog_LDADD += -lresolv Index: ettercap-NG-0.7.3/utils/etterfilter/Makefile.am =================================================================== --- ettercap-NG-0.7.3.orig/utils/etterfilter/Makefile.am +++ ettercap-NG-0.7.3/utils/etterfilter/Makefile.am @@ -26,22 +26,6 @@ etterfilter_SOURCES = ef_compiler.c \ $(top_srcdir)/src/ec_strings.c noinst_HEADERS = ef_grammar.h - -if MISSING_STRSEP - etterfilter_SOURCES += $(top_srcdir)/src/missing/strsep.c -endif -if MISSING_STRLCPY - etterfilter_SOURCES += $(top_srcdir)/src/missing/strlcpy.c -endif -if MISSING_MEMMEM - etterfilter_SOURCES += $(top_srcdir)/src/missing/memmem.c -endif -if MISSING_INET_ATON - etterfilter_SOURCES += $(top_srcdir)/src/missing/inet_aton.c -endif -if MISSING_GETOPT_LONG - etterfilter_SOURCES += $(top_srcdir)/src/missing/getopt.c -endif etterfilter_CFLAGS = @EC_CFLAGS@ @@ -49,7 +33,7 @@ if BSD etterfilter_CFLAGS += -pthread endif -etterfilter_LDADD = +etterfilter_LDADD = @LIBOBJS@ if INET_ATON_WANTS_RESOLV etterfilter_LDADD += -lresolv