Also look for napatech include files in /opt/napatech/include/napatech, etc.

git-svn-id: file:///home/svn/mapi/trunk@1476 8d5bb341-7cf1-0310-8cf6-ba355fef3186

configure.ac

@@ -583,7 +583,7 @@ AC_SUBST(DAGLIB)
 #
 AC_MSG_CHECKING([for libnapatech])
 AC_ARG_WITH(libnapatech,
-AS_HELP_STRING([--with-libnapatech=DIR], [Manual libnapatech path configuration, in case the configuration script can't find it. Search for libnapatech in DIR/lib, and for the header file in DIR/include. Effective only if --enable-napatech has been previously specified]),
+AS_HELP_STRING([--with-libnapatech=DIR], [Manual libnapatech path configuration, in case the configuration script can't find it. Search for libnapatech in DIR/lib, and for the header file in DIR/include and DIR/include/napatech. Effective only if --enable-napatech has been previously specified]),
 [ case "$withval" in
 	yes|no)
 		AC_MSG_RESULT(no)
@@ -593,10 +593,16 @@ AS_HELP_STRING([--with-libnapatech=DIR], [Manual libnapatech path configuration,
         	AC_MSG_ERROR(Please use --with-libnapatech only in conjunction with --enable-napatech. You don't need to configure libnapatech if you are not going to use a Napatech card.)
 		else
 			AC_MSG_RESULT($withval)
-			if test -f $withval/include/NTCommonInterface.h -a -f $withval/lib/libntcommoninterface.so; then
+			incdir=""
+			if test -f $withval/include/NTCommonInterface.h; then
+			        incdir=$withval/include
+			elif test -f $withval/include/napatech/NTCommonInterface.h; then
+			        incdir=$withval/include/napatech
+			fi
+			if test "x$incdir" != "x"  -a -f $withval/lib/libntcommoninterface.so; then
 				owd=`pwd`
 				if cd $withval; then withval=`pwd`; cd $owd; fi
-				NAPATECHINC="-I$withval/include"
+				NAPATECHINC="-I$incdir"
 				NAPATECHLIB="-L$withval/lib -lntcommoninterface"
 			else
 				AC_MSG_ERROR(NTCommonInterface.h or libntcommoninterface.so not found in $withval/include and $withval/lib)
@@ -611,9 +617,15 @@ AS_HELP_STRING([--with-libnapatech=DIR], [Manual libnapatech path configuration,
 	elif test -f /opt/napatech/include/NTCommonInterface.h -a -f /opt/napatech/lib/libntcommoninterface.so; then
 		NAPATECHINC="-I/opt/napatech/include"
 		NAPATECHLIB="-L/opt/napatech/lib -lntcommoninterface"
+	elif test -f /opt/napatech/include/napatech/NTCommonInterface.h -a -f /opt/napatech/lib/libntcommoninterface.so; then
+		NAPATECHINC="-I/opt/napatech/include/napatech"
+		NAPATECHLIB="-L/opt/napatech/lib -lntcommoninterface"
 	elif test -f /usr/local/include/NTCommonInterface.h -a -f /usr/local/lib/libntcommoninterface.so; then
-		NAPATECHINC="-I${prefix}/include"
-		NAPATECHLIB="-L${prefix}/lib -lntcommoninterface"
+		NAPATECHINC="-I/usr/local/include"
+		NAPATECHLIB="-L/usr/local/lib -lntcommoninterface"
+	elif test -f /usr/local/include/napatech/NTCommonInterface.h -a -f /usr/local/lib/libntcommoninterface.so; then
+		NAPATECHINC="-I/usr/local/include/napatech"
+		NAPATECHLIB="-L/usr/local/lib -lntcommoninterface"
 	elif test -f /usr/include/napatech/NTCommonInterface.h; then
 		NAPATECHINC="-I/usr/include/napatech"
 		NAPATECHLIB="-lntcommoninterface"