gnue/geas configure.in src/Makefile.am tools/Ma...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/09/10 15:57:07

Modified files:
        geas           : configure.in 
        geas/src       : Makefile.am 
        geas/tools     : Makefile.am 

Log message:
        Link all programs that use libuuid with -lsocket on solaris

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/configure.in.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/src/Makefile.am.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/tools/Makefile.am.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.46 gnue/geas/configure.in:1.47
--- gnue/geas/configure.in:1.46 Mon Sep 10 09:47:01 2001
+++ gnue/geas/configure.in      Mon Sep 10 15:57:07 2001
@@ -12,29 +12,32 @@
 AM_PROG_LIBTOOL
 
 dnl Checks for libraries.
-AC_CHECK_FUNCS(getopt_long)
 AM_PATH_GLIB(1.2.0,,,gmodule)
 AM_PATH_ORBIT(0.5.1)
 AM_PATH_PYTHON(module)
 AM_CHECK_PYMOD(CORBA)
 AM_CHECK_PYTHON_HEADERS
+dnl libuuid needs the socket library on solaris
+AC_CHECK_LIB(socket,socket,[SOCKET_LIB=-lsocket],[SOCKET_LIB=""])
+AC_SUBST(SOCKET_LIB)
 
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
+AC_HEADER_TIME
 AC_CHECK_HEADERS(limits.h sys/time.h unistd.h getopt.h)
 AC_CHECK_HEADERS(uuid/uuid.h,,AC_MSG_ERROR('You need the uuid library'))
 
 dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
+AC_TYPE_SIGNAL
 AC_STRUCT_TM
+AC_C_CONST
 
 dnl Checks for library functions.
-AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(getopt_long)
 
 dnl ===========================================================================
 dnl Figure out the database drivers to compile
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.42 gnue/geas/src/Makefile.am:1.43
--- gnue/geas/src/Makefile.am:1.42      Thu Sep  6 14:33:41 2001
+++ gnue/geas/src/Makefile.am   Mon Sep 10 15:57:07 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.42 2001/09/06 18:33:41 reinhard Exp $
+## $Id: Makefile.am,v 1.43 2001/09/10 19:57:07 reinhard Exp $
 
 SUBDIRS        = classdef config objectstore oql objectcache methods 
datamonitor
 
@@ -37,6 +37,7 @@
         $(MODULES) \
         $(PYTHON_LIBS) \
         -luuid \
+        $(SOCKET_LIB) \
         ../lib/classdefs/libclassdefs.a
 
 geas_srvr_headers = \
Index: gnue/geas/tools/Makefile.am
diff -u gnue/geas/tools/Makefile.am:1.9 gnue/geas/tools/Makefile.am:1.10
--- gnue/geas/tools/Makefile.am:1.9     Mon Jul 23 18:10:38 2001
+++ gnue/geas/tools/Makefile.am Mon Sep 10 15:57:07 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.9 2001/07/23 22:10:38 reinhard Exp $
+## $Id: Makefile.am,v 1.10 2001/09/10 19:57:07 reinhard Exp $
 
 bin_PROGRAMS = gcdverifier geas-oidgen
 
@@ -10,4 +10,4 @@
 
 geas_oidgen_SOURCES = geas-oidgen.c
 
-geas_oidgen_LDADD = -luuid
+geas_oidgen_LDADD = -luuid $(SOCKET_LIB)