[Gaim-commits] SF.net SVN: gaim: [18236] trunk/console/libgnt/configure.ac

[<sa...@us...>]

Revision: 18236
          http://svn.sourceforge.net/gaim/?rev=18236&view=rev
Author:   sadrul
Date:     2007-04-06 21:06:48 -0700 (Fri, 06 Apr 2007)

Log Message:
-----------
Allow --with-ncurses-headers= configure option from here too

Modified Paths:
--------------
    trunk/console/libgnt/configure.ac

Modified: trunk/console/libgnt/configure.ac
===================================================================
--- trunk/console/libgnt/configure.ac	2007-04-04 20:22:16 UTC (rev 18235)
+++ trunk/console/libgnt/configure.ac	2007-04-07 04:06:48 UTC (rev 18236)
@@ -203,6 +203,9 @@
 
 GNT_CFLAGS=
 GNT_LIBS=
+AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-ncurses-headers=DIR],
+		[compile libgnt against the ncurses includes in DIR])],
+		[ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
 AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"], [enable_gnt=no])
 AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"], [enable_gnt=no])
 
@@ -214,8 +217,9 @@
 else
 	dnl # Some distros put the headers in ncursesw/, some don't
 	found_ncurses_h=no
-	for f in /usr/include/ncursesw/ncurses.h /usr/include/ncurses.h
+	for location in $ac_ncurses_includes /usr/include/ncursesw /usr/include
 	do
+		f="$location/ncurses.h"
 		AC_CHECK_HEADER($f,[
 			AC_MSG_CHECKING([if $f supports wide characters])
 			AC_TRY_COMPILE([
@@ -226,7 +230,7 @@
 				# error get_wch not found!
 				#endif
 			], [
-				dir=`dirname $f`
+				dir=$location
 				if test x"$dir" != x"." ; then
 					GNT_CFLAGS="-I$dir/"
 				else
@@ -241,13 +245,16 @@
 			])
 		])
 	done
+	if test x"$found_ncurses_h" != "xyes"; then
+		enable_gnt="no"
+	fi
 fi
 AC_SUBST(GNT_CFLAGS)
 AC_SUBST(GNT_LIBS)
 
 if test "x$enable_gnt" = "xno"; then
 	AC_MSG_ERROR([
-*** You need ncursesw or ncurses.])
+*** You need ncursesw or ncurses and its header files.])
 fi
 
 AC_OUTPUT([Makefile


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.