[Guessnet-devel] [svn] r159 - in trunk: . debian src

[Enrico Zini]

Author: enrico
Date: Fri Aug 25 19:15:13 2006
New Revision: 159

Modified:
   trunk/   (props changed)
   trunk/configure.ac
   trunk/debian/control
   trunk/src/GuessnetParser.cc
   trunk/src/IfaceParser.cc
Log:
 r416 at viaza:  enrico | 2006-08-25 20:14:57 +0100
 Don't look for the absolute path of pppoe, and just let the shell resolve it.


Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Aug 25 19:15:13 2006
@@ -93,16 +93,6 @@
 AC_DEFINE_UNQUOTED(IFCONFIG, "$IFCONFIG", [Path to ifconfig])
 AC_PATH_PROG(GREP, grep)
 AC_DEFINE_UNQUOTED(GREP, "$GREP", [Path to grep])
-AC_PATH_PROG(PPPOE, [pppoe], [pppoe-not-found], [$PATH:/usr/sbin:/sbin])
-if test $PPPOE = pppoe-not-found
-then
-	AC_MSG_WARN([
-*** pppoe not found: pppoe support won't be enabled in guessnet
-])
-else
-	AC_DEFINE_UNQUOTED(PPPOE, "$PPPOE", [Path to pppoe])
-	AC_DEFINE(HAVE_PPPOE, [], [Defined if pppoe support is enabled])
-fi
 
 CFLAGS="-Wall $CFLAGS"
 

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Fri Aug 25 19:15:13 2006
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Enrico Zini <enrico at debian.org>
-Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libnet1-dev (>= 1.1.1rel-2), libpcap-dev, pppoe, libtut-dev, libwibble-dev (>= 0.1.3), libwibble-dev (<< 0.2)
+Build-Depends: cdbs, debhelper (>> 4.1), dh-buildinfo, libnet1-dev (>= 1.1.1rel-2), libpcap-dev, libtut-dev, libwibble-dev (>= 0.1.3), libwibble-dev (<< 0.2)
 Standards-Version: 3.7.2.0
 
 Package: guessnet

Modified: trunk/src/GuessnetParser.cc
==============================================================================
--- trunk/src/GuessnetParser.cc	(original)
+++ trunk/src/GuessnetParser.cc	Fri Aug 25 19:15:13 2006
@@ -168,7 +168,6 @@
 				sc.handleScan(new DHCPScan(name));
 				found++;
 			}
-#ifdef HAVE_PPPOE
 			else if (pppoe_line.match(line))
 			{
 				string name = script_line[1];
@@ -176,10 +175,9 @@
 				//debug("Will use script %.*s to test %.*s\n",
 				//	PFSTR(cmd), PFSTR(name));
 
-				sc.handleScan(new ScriptScan(name, string(PPPOE " -I ") + Environment::get().iface() + " -A >/dev/null 2>&1"));
+				sc.handleScan(new ScriptScan(name, string("pppoe -I ") + Environment::get().iface() + " -A >/dev/null 2>&1"));
 				found++;
 			}
-#endif
 			else if (wireless_mac_essid_line.match(line))
 			{
 				string name = wireless_mac_essid_line[1];

Modified: trunk/src/IfaceParser.cc
==============================================================================
--- trunk/src/IfaceParser.cc	(original)
+++ trunk/src/IfaceParser.cc	Fri Aug 25 19:15:13 2006
@@ -222,16 +222,14 @@
 					found++;
 				}
 			}
-#ifdef HAVE_PPPOE
 			else if (pppoe_line.match(line))
 			{
 				if (profileName.size())
 				{
-					sc.handleScan(new ScriptScan(profileName, string(PPPOE " -I ") + Environment::get().iface() + " -A >/dev/null 2>&1"));
+					sc.handleScan(new ScriptScan(profileName, string("pppoe -I ") + Environment::get().iface() + " -A >/dev/null 2>&1"));
 					found++;
 				}
 			}
-#endif
 			else if (wireless_mac_essid_line.match(line))
 			{
 				if (profileName.size())