pidgin: 1fffc4e2: Fix build with --with-ncurses-headers.

[sadrul at pidgin.im]

----------------------------------------------------------------------
Revision: 1fffc4e22ae02e60efdb045e11841769fa2bf063
Parent:   5bcc955b6b9161a848b0a011cbb7d8dfa3f928bd
Author:   sadrul at pidgin.im
Date:     07/05/10 11:00:36
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1fffc4e22ae02e60efdb045e11841769fa2bf063

Changelog: 

Fix build with --with-ncurses-headers.

Changes against parent 5bcc955b6b9161a848b0a011cbb7d8dfa3f928bd

  patched  configure.ac
  patched  finch/libgnt/configure.ac

-------------- next part --------------
============================================================
--- configure.ac	5e70dd61763e64c24d1b7abb832541e722470080
+++ configure.ac	33ec0e7e1dab4bf9eb143dff0cd9b219f4634f32
@@ -662,6 +662,10 @@ if test "x$enable_consoleui" = "xyes"; t
 		for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
 		do
 			f="$location/ncurses.h"
+			orig_CFLAGS="$CFLAGS"
+			orig_CPPFLAGS="$CPPFLAGS"
+			CFLAGS="$CFLAGS -I$location"
+			CPPFLAGS="$CPPFLAGS -I$location"
 			AC_CHECK_HEADER($f,[
 				AC_MSG_CHECKING([if $f supports wide characters])
 				AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -680,9 +684,13 @@ if test "x$enable_consoleui" = "xyes"; t
 					fi
 
 					found_ncurses_h=yes
+					CFLAGS="$orig_CFLAGS"
+					CPPFLAGS="$orig_CPPFLAGS"
 					AC_MSG_RESULT([yes])
 					break
 				], [
+					CFLAGS="$orig_CFLAGS"
+					CPPFLAGS="$orig_CPPFLAGS"
 					AC_MSG_RESULT([no])
 				])
 			])
@@ -1358,6 +1366,7 @@ AC_ARG_ENABLE(nm, [AC_HELP_STRING([--dis
 
 AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--disable-dbus], [disable D-Bus support])], , enable_dbus=yes)
 AC_ARG_ENABLE(nm, [AC_HELP_STRING([--disable-nm], [disable NetworkManager support (requires D-Bus)])], enable_nm=$enableval, enable_nm=yes)
+enable_nm=no
 
 if test "x$enable_dbus" = "xyes" ; then
 	AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no)
============================================================
--- finch/libgnt/configure.ac	6262c36ac78186cbf3fc610d4f6e7584af2d6e9a
+++ finch/libgnt/configure.ac	58e07786572c6f190bd0116cb5e16ee37a800121
@@ -265,6 +265,10 @@ else
 	for location in $ac_ncurses_includes /usr/include/ncursesw /usr/include
 	do
 		f="$location/ncurses.h"
+		orig_CFLAGS="$CFLAGS"
+		orig_CPPFLAGS="$CPPFLAGS"
+		CFLAGS="$CFLAGS -I$location"
+		CPPFLAGS="$CPPFLAGS -I$location"
 		AC_CHECK_HEADER($f,[
 			AC_MSG_CHECKING([if $f supports wide characters])
 			AC_TRY_COMPILE([
@@ -283,9 +287,13 @@ else
 				fi
 
 				found_ncurses_h=yes
+				CFLAGS="$orig_CFLAGS"
+				CPPFLAGS="$orig_CPPFLAGS"
 				AC_MSG_RESULT([yes])
 				break
 			], [
+				CFLAGS="$orig_CFLAGS"
+				CPPFLAGS="$orig_CPPFLAGS"
 				AC_MSG_RESULT([no])
 			])
 		])