[Opensrf-commits] r1428 - in trunk: . src/libopensrf

[svn at svn.open-ils.org]

Author: sboyette
Date: 2008-09-15 12:47:20 -0400 (Mon, 15 Sep 2008)
New Revision: 1428

Modified:
   trunk/autogen.sh
   trunk/configure.ac
   trunk/src/libopensrf/osrf_system.c
   trunk/src/libopensrf/transport_session.c
Log:
initial steps toward OS X portage

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2008-09-15 16:43:49 UTC (rev 1427)
+++ trunk/autogen.sh	2008-09-15 16:47:20 UTC (rev 1428)
@@ -1,7 +1,13 @@
 #!/bin/sh
 # autogen.sh - generates configure using the autotools
 
-: ${LIBTOOLIZE=libtoolize}
+OS=`uname`
+if [ "$OS" == "Darwin" ]; then
+    : ${LIBTOOLIZE=glibtoolize}
+elif [ "$OS" == "Linux" ]; then
+    : ${LIBTOOLIZE=libtoolize}
+fi
+
 : ${ACLOCAL=aclocal}
 : ${AUTOHEADER=autoheader}
 : ${AUTOMAKE=automake}
@@ -15,7 +21,7 @@
 
 ${AUTOCONF}
 
-SILENT=`which libtoolize aclocal autoheader automake autoconf`
+SILENT=`which ${LIBTOOLIZE} ${ACLOCAL} ${AUTOHEADER} ${AUTOMAKE} ${AUTOCONF}`
 case "$?" in
     0 )
         echo All build tools found.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-09-15 16:43:49 UTC (rev 1427)
+++ trunk/configure.ac	2008-09-15 16:47:20 UTC (rev 1428)
@@ -202,7 +202,7 @@
 #-----------------------------
 
 AC_CHECK_LIB([dl], [dlerror], [],AC_MSG_ERROR(***OpenSRF requires libdl))
-AC_CHECK_LIB([memcache], [mc_req_free], [], AC_MSG_ERROR(***OpenSRF requires memcache development headers))
+AC_SEARCH_LIBS([mc_req_free], [memcache], [], AC_MSG_ERROR(***OpenSRF requires memcache development headers))
 AC_CHECK_LIB([ncurses], [initscr], [], AC_MSG_ERROR(***OpenSRF requires ncurses development headers))
 AC_CHECK_LIB([readline], [readline], [], AC_MSG_ERROR(***OpenSRF requires readline development headers))
 AC_CHECK_LIB([xml2], [xmlAddID], [], AC_MSG_ERROR(***OpenSRF requires xml2 development headers))

Modified: trunk/src/libopensrf/osrf_system.c
===================================================================
--- trunk/src/libopensrf/osrf_system.c	2008-09-15 16:43:49 UTC (rev 1427)
+++ trunk/src/libopensrf/osrf_system.c	2008-09-15 16:47:20 UTC (rev 1428)
@@ -3,6 +3,10 @@
 #include <opensrf/osrf_prefork.h>
 #include <signal.h>
 
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 256
+#endif
+
 static void report_child_status( pid_t pid, int status );
 struct child_node;
 typedef struct child_node ChildNode;

Modified: trunk/src/libopensrf/transport_session.c
===================================================================
--- trunk/src/libopensrf/transport_session.c	2008-09-15 16:43:49 UTC (rev 1427)
+++ trunk/src/libopensrf/transport_session.c	2008-09-15 16:47:20 UTC (rev 1428)
@@ -1,5 +1,9 @@
 #include <opensrf/transport_session.h>
 
+#ifndef HOST_NAME_MAX
+#define HOST_NAME_MAX 256
+#endif
+
 static char* get_xml_attr( const xmlChar** atts, const char* attr_name );
 
 // ---------------------------------------------------------------------------------