Author: titmuss
Date: Wed Feb 13 09:28:52 2008
New Revision: 1939
URL: http://svn.slimdevices.com?rev=1939&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1925): titmuss | 2008-02-13 16:59:28 +0000
Bug: 7086
Description:
configure changes.
Modified:
trunk/ (props changed)
trunk/jive/src/pkg/Makefile.linux
trunk/jive/src/pkg/jive/configure
trunk/jive/src/pkg/jive/configure.in
trunk/jive/src/pkg/jive/src/config.h.in
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Feb 13 09:28:52 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1924
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1925
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/jive/src/pkg/Makefile.linux
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/Makefile.linux?rev=1939&root=Jive&r1=1938&r2=1939&view=diff
==============================================================================
--- trunk/jive/src/pkg/Makefile.linux (original)
+++ trunk/jive/src/pkg/Makefile.linux Wed Feb 13 09:28:52 2008
@@ -37,8 +37,8 @@
# SDL
#####
-.PHONY: sdl-all freetype sdl sdl-image sdl-tff sdl-gfx
-sdl-all: freetype sdl sdl-ttf sdl-image sdl-gfx
+.PHONY: sdl-all freetype sdl sdl-image sdl-tff sdl-gfx c-ares
+sdl-all: freetype sdl sdl-ttf sdl-image sdl-gfx c-ares
# freetype
freetype-2.1.10/config.mk:
@@ -75,6 +75,12 @@
sdl-gfx: SDL_gfx-2.0.15/Makefile
cd SDL_gfx-2.0.15; make && make install
+# c-ares
+c-ares-1.5.1/Makefile:
+ cd c-ares-1.5.1; ./configure --prefix=${PREFIX}
+
+c-ares: c-ares-1.5.1/Makefile
+ cd c-ares-1.5.1; make && make install
#####
# lua
Modified: trunk/jive/src/pkg/jive/configure
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/configure?rev=1939&root=Jive&r1=1938&r2=1939&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/configure (original)
+++ trunk/jive/src/pkg/jive/configure Wed Feb 13 09:28:52 2008
@@ -21120,7 +21120,8 @@
-for ac_func in malloc calloc realloc getcwd gettimeofday memmove realpath
strchr strdup strerror strtol sqrt
+
+for ac_func in malloc calloc realloc getcwd gettimeofday memmove realpath
strchr strdup strerror strtol sqrt inet_aton
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
Modified: trunk/jive/src/pkg/jive/configure.in
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/configure.in?rev=1939&root=Jive&r1=1938&r2=1939&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/configure.in (original)
+++ trunk/jive/src/pkg/jive/configure.in Wed Feb 13 09:28:52 2008
@@ -57,7 +57,7 @@
# Checks for library functions.
AC_PROG_GCC_TRADITIONAL
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([malloc calloc realloc getcwd gettimeofday memmove realpath
strchr strdup strerror strtol sqrt])
+AC_CHECK_FUNCS([malloc calloc realloc getcwd gettimeofday memmove realpath
strchr strdup strerror strtol sqrt inet_aton])
# Test programs
AC_ARG_ENABLE(tests,
Modified: trunk/jive/src/pkg/jive/src/config.h.in
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/src/config.h.in?rev=1939&root=Jive&r1=1938&r2=1939&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/src/config.h.in (original)
+++ trunk/jive/src/pkg/jive/src/config.h.in Wed Feb 13 09:28:52 2008
@@ -17,6 +17,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
+
+/* Define to 1 if you have the `inet_aton' function. */
+#undef HAVE_INET_ATON
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
