Pidgin

Revision: 16421
Author:   sadrul
Date:     2006-07-04 11:49:13 -0700 (Tue, 04 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16421&view=rev

Log Message:
-----------
Paco-Paco thinks it would be good to make libgnt configure look for ncursesw.
Thanks to rekkanoryo and grim, we can do that.

Modified Paths:
--------------
    trunk/console/libgnt/configure.ac
Modified: trunk/console/libgnt/configure.ac
===================================================================
--- trunk/console/libgnt/configure.ac	2006-07-04 05:17:07 UTC (rev 16420)
+++ trunk/console/libgnt/configure.ac	2006-07-04 18:49:13 UTC (rev 16421)
@@ -239,6 +239,8 @@
 AC_CHECK_HEADERS(termios.h)
 #AC_VAR_TIMEZONE_EXTERNALS
 
+AC_CHECK_LIB(ncursesw, initscr, , [AC_MSG_ERROR([
+*** You need ncursesw. ])])
 
 AC_OUTPUT([Makefile
            gnt.pc


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

Revision: 16912
Author:   eblanton
Date:     2006-08-20 11:07:34 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16912&view=rev

Log Message:
-----------
libgnt doesn't use sockets, so yoink the configure stuff to prevent linking it

Modified Paths:
--------------
    trunk/console/libgnt/configure.ac
Modified: trunk/console/libgnt/configure.ac
===================================================================
--- trunk/console/libgnt/configure.ac	2006-08-20 18:05:40 UTC (rev 16911)
+++ trunk/console/libgnt/configure.ac	2006-08-20 18:07:34 UTC (rev 16912)
@@ -37,43 +37,6 @@
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(strdup strstr atexit setlocale)
 
-dnl Check for inet_aton
-AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
-				         [AC_ERROR(inet_aton not found)])])
-AC_CHECK_LIB(resolv, __res_query)
-AC_CHECK_LIB(nsl, gethostent)
-AC_CHECK_FUNC(socket, ,
-              [AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])])
-dnl If all goes well, by this point the previous two checks will have
-dnl pulled in -lsocket and -lnsl if we need them.
-AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE([HAVE_GETADDRINFO], [1],
-                                      [Define to 1 if you have the getaddrinfo function.])],
-              [AC_CHECK_LIB(socket, getaddrinfo,
-                            [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lsnl $LIBS"], , , -lnsl)])
-
-dnl Check for socklen_t (in Unix98)
-AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	socklen_t x;
-], [],
-[
-	AC_MSG_RESULT(yes)
-], [
-	AC_TRY_COMPILE([
-		#include <sys/types.h>
-		#include <sys/socket.h>
-		int accept(int, struct sockaddr *, size_t *);
-	], [], [
-		AC_MSG_RESULT(size_t)
-		AC_DEFINE(socklen_t, size_t, [socklen_t size])
-	], [
-		AC_MSG_RESULT(int)
-		AC_DEFINE(socklen_t, int, [socklen_t size])
-	])
-])
-
 dnl to prevent the g_stat()/g_unlink() crash,
 dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in configure.ac
 AC_SYS_LARGEFILE


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

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.