PERFORCE change 163518 for review

[Nikhil Bysani]

http://perforce.freebsd.org/chv.cgi?CH=163518

Change 163518 by nikron at nmfreebsd on 2009/06/04 20:05:21

	Hack to allow libnm-util to include /usr/local/include

Affected files ...

.. //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#4 edit
.. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/Makefile.am#1 add

Differences ...

==== //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#4 (text+ko) ====

@@ -97,6 +97,9 @@
 	if test "z$with_distro" = "z"; then
 		with_distro=`lsb_release -is`
 	fi
+	if test "z$with_distro" = "z"; then
+		with_distro=`uname`
+	fi
 fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
 
@@ -105,7 +108,7 @@
 	exit 1
 else
 	case $with_distro in
-		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;;
+		redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|freebsd) ;;
 		*)
 			echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
 			exit 1
@@ -158,23 +161,30 @@
   AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva])
 fi
 
-AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
-AC_TRY_COMPILE([#ifndef __user
-                #define __user
-                #endif
-                #include <sys/types.h>
-                #include <linux/types.h>
-                #include <sys/socket.h>
-                #include <net/if.h>
-                #include <wireless.h>],
-               [#ifndef IWEVGENIE
-                #error "not found"
-                #endif],
-               [ac_have_iwevgenie=yes],
-               [ac_have_iwevgenie=no])
-AC_MSG_RESULT($ac_have_iwevgenie)
-if test "$ac_have_iwevgenie" = no; then
+AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd)
+if test x"$with_distro" = xfreebsd; then
+  AC_DEFINE(TARGET_FREEBSD, 1, [Define if you have FreeBSD])
+
+else
+
+	AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
+	AC_TRY_COMPILE([#ifndef __user
+		#define __user
+		#endif
+		#include <sys/types.h>
+		#include <linux/types.h>
+		#include <sys/socket.h>
+		#include <net/if.h>
+		#include <wireless.h>],
+	       [#ifndef IWEVGENIE
+		#error "not found"
+		#endif],
+	       [ac_have_iwevgenie=yes],
+	       [ac_have_iwevgenie=no])
+	AC_MSG_RESULT($ac_have_iwevgenie)
+	if test "$ac_have_iwevgenie" = no; then
 	AC_MSG_ERROR(wireless-tools library and development headers >= 28pre9 not installed or not functional)
+	fi
 fi
 
 PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.75)
@@ -204,9 +214,11 @@
 AC_SUBST(HAL_CFLAGS)
 AC_SUBST(HAL_LIBS)
 
-PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.0-pre8)
-AC_SUBST(LIBNL_CFLAGS)
-AC_SUBST(LIBNL_LIBS)
+if ! (test x"$with_distro" = "xfreebsd"); then
+	PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.0-pre8)
+	AC_SUBST(LIBNL_CFLAGS)
+	AC_SUBST(LIBNL_LIBS)
+fi
 
 PKG_CHECK_MODULES(UUID, uuid)
 AC_SUBST(UUID_CFLAGS)
@@ -293,17 +305,20 @@
 AC_SUBST(DBUS_SYS_DIR)
 
 # PPPD
-AC_CHECK_HEADERS(pppd/pppd.h,,
-  AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.))
+if (test x"$with_distro" = "xfreebsd"); then
+else
+	AC_CHECK_HEADERS(pppd/pppd.h,,
+	  AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.))
 
-AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory]))
+	AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory]))
 
-if test -n "$with_pppd_plugin_dir" ; then
-	PPPD_PLUGIN_DIR="$with_pppd_plugin_dir"
-else
-	PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.4"
+	if test -n "$with_pppd_plugin_dir" ; then
+		PPPD_PLUGIN_DIR="$with_pppd_plugin_dir"
+	else
+		PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.4"
+	fi
+	AC_SUBST(PPPD_PLUGIN_DIR)
 fi
-AC_SUBST(PPPD_PLUGIN_DIR)
 
 # DHCP client
 AC_ARG_WITH([dhcp-client], AS_HELP_STRING([--with-dhcp-client=dhcpcd|dhclient], [path to the chosen dhcp client]))