code.vuplus.com Git - vuplus_openembedded/blob - recipes/ettercap/files/autotools.patch

   1 diff -ur ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3-changed/configure.in
   2 --- ettercap-NG-0.7.3/configure.in      2005-01-13 10:24:28.000000000 +0100
   3 +++ ettercap-NG-0.7.3-changed/configure.in      2007-11-07 11:42:25.000000000 +0100
   4 @@ -178,6 +178,7 @@
   5
   6  AC_PROG_CC
   7  AM_PROG_CC_STDC
   8 +AM_PROG_CC_C_O
   9  AC_PROG_INSTALL
  10  AC_PROG_MAKE_SET
  11  AC_PROG_GCC_TRADITIONAL
  12 @@ -236,7 +237,7 @@
  13  AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h)
  14  AC_CHECK_HEADERS(sys/cdefs.h)
  15  dnl nameser NS_GET32 and so on...
  16 -EC_NS_GET()
  17 +dnl EC_NS_GET()
  18
  19  dnl ==================================================================
  20  dnl   Checks for typedefs, structures, and compiler characteristics.
  21 @@ -379,129 +380,6 @@
  22  dnl ==================
  23
  24
  25 -dnl ---------
  26 -dnl  libpcap
  27 -dnl ---------
  28 -ac_ec_libpcap=default
  29 -
  30 -AC_MSG_CHECKING(for libpcap)
  31 -AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR,use libpcap in DIR),
  32 -[ case "$withval" in
  33 -  no)
  34 -     AC_MSG_RESULT(no)
  35 -     AC_MSG_ERROR(["*** ettercap cannot operate without libpcap. ***"])
  36 -     ;;
  37 -  *)
  38 -     if test -f $withval/pcap.h; then
  39 -        owd=`pwd`
  40 -        if cd $withval; then withval=`pwd`; cd $owd; fi
  41 -        PCAPINC="-I$withval"
  42 -        if test "$OS" = "WINDOWS"; then
  43 -           PCAPLIB="-L$withval -lwpcap -lpacket"
  44 -        else
  45 -           PCAPLIB="-L$withval -lpcap"
  46 -        fi
  47 -        ac_ec_libpcap=$withval
  48 -        AC_MSG_RESULT($withval)
  49 -     elif test -f $withval/include/pcap.h; then
  50 -        owd=`pwd`
  51 -        if cd $withval; then withval=`pwd`; cd $owd; fi
  52 -        PCAPINC="-I$withval/include"
  53 -        if test "$OS" = "WINDOWS"; then
  54 -           PCAPLIB="-L$withval/lib -lwpcap -lpacket"
  55 -        else
  56 -           PCAPLIB="-L$withval/lib -lpcap"
  57 -        fi
  58 -        ac_ec_libpcap=$withval
  59 -        AC_MSG_RESULT($withval)
  60 -     else
  61 -        AC_MSG_RESULT(no)
  62 -        AC_MSG_ERROR([pcap.h not found in $withval])
  63 -     fi
  64 -     ;;
  65 -  esac ],
  66 -[ if test -f /usr/include/pcap/pcap.h; then
  67 -     PCAPINC="-I/usr/include/pcap"
  68 -     if test "$OS" = "WINDOWS"; then
  69 -        PCAPLIB="-lwpcap -lpacket"
  70 -     else
  71 -        PCAPLIB="-lpcap"
  72 -     fi
  73 -  elif test -f /usr/include/pcap.h; then
  74 -     if test "$OS" = "WINDOWS"; then
  75 -        PCAPLIB="-lwpcap -lpacket"
  76 -     else
  77 -        PCAPLIB="-lpcap"
  78 -     fi
  79 -  elif test -f /usr/local/include/pcap.h; then
  80 -     PCAPINC="-I/usr/local/include"
  81 -     if test "$OS" = "WINDOWS"; then
  82 -        PCAPLIB="-lwpcap -lpacket"
  83 -     else
  84 -        PCAPLIB="-lpcap"
  85 -     fi
  86 -  else
  87 -     AC_MSG_RESULT(no)
  88 -     AC_MSG_ERROR([libpcap not found])
  89 -  fi
  90 -  AC_MSG_RESULT(yes) ]
  91 -)
  92 -
  93 -if test "$OS" = "WINDOWS"; then
  94 -   EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
  95 -   EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
  96 -   AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.]))
  97 -   AC_CHECK_LIB(iphlpapi, main)
  98 -else
  99 -   EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
 100 -fi
 101 -
 102 -dnl ---------
 103 -dnl  libnet
 104 -dnl ---------
 105 -ac_ec_libnet=default
 106 -
 107 -AC_MSG_CHECKING(for libnet)
 108 -AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,use libnet in DIR),
 109 -[ case "$withval" in
 110 -  no)
 111 -     AC_MSG_RESULT(no)
 112 -     AC_MSG_ERROR(["*** ettercap cannot operate without libnet. ***"])
 113 -     ;;
 114 -  *)
 115 -     if test -f $withval/lnet.h; then
 116 -        owd=`pwd`
 117 -        if cd $withval; then withval=`pwd`; cd $owd; fi
 118 -        LNETINC="-I$withval"
 119 -        LNETLIB="-L$withval -lnet"
 120 -        ac_ec_libnet=$withval
 121 -        AC_MSG_RESULT($withval)
 122 -     elif test -f $withval/include/libnet.h; then
 123 -        owd=`pwd`
 124 -        if cd $withval; then withval=`pwd`; cd $owd; fi
 125 -        LNETINC="-I$withval/include"
 126 -        LNETLIB="-L$withval/lib -L$withval/src -lnet"
 127 -        ac_ec_libnet=$withval
 128 -        AC_MSG_RESULT($withval)
 129 -     else
 130 -        AC_MSG_RESULT(no)
 131 -        AC_MSG_ERROR([libnet.h not found in $withval])
 132 -     fi
 133 -     ;;
 134 -  esac ],
 135 -[ if test -f /usr/include/libnet.h; then
 136 -     AC_MSG_RESULT(yes)
 137 -     LNETINC=""
 138 -     LNETLIB="-lnet"
 139 -  else
 140 -     AC_MSG_RESULT(no)
 141 -     AC_MSG_ERROR([libnet >= 1.1.2.1 not found])
 142 -  fi
 143 -]
 144 -)
 145 -
 146 -EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required]))
 147 -
 148  dnl ------------------
 149  dnl Checks for openssl
 150  dnl ------------------
 151 @@ -794,7 +672,8 @@
 152  dnl  set up the final vars
 153  dnl -----------------------
 154  EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
 155 -EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
 156 +dnl EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
 157 +EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB -lpcap -lnet"
 158
 159  AC_SUBST(EC_CFLAGS)
 160  AC_SUBST(EC_LIBS)
 161 diff -ur ettercap-NG-0.7.3/src/Makefile.am ettercap-NG-0.7.3-changed/src/Makefile.am
 162 --- ettercap-NG-0.7.3/src/Makefile.am   2005-01-13 10:18:48.000000000 +0100
 163 +++ ettercap-NG-0.7.3-changed/src/Makefile.am   2007-11-06 20:15:12.000000000 +0100
 164 @@ -127,8 +127,7 @@
 165
 166  ettercap_CFLAGS = @EC_CFLAGS@
 167
 168 -ettercap_LDADD = @LIBOBJS@ \
 169 -                 os/libec_os.a \
 170 +ettercap_LDADD = missing/strlcpy.o os/libec_os.a \
 171                   interfaces/daemon/libec_daemon.a \
 172                   interfaces/text/libec_text.a
 173