changes

smmapdfw/Makefile.in

@@ -9,9 +9,6 @@ libsmmapdfw/libsmmapdfw.a:
 	cd libsmmapdfw && $(MAKE)
 
 
-.c.o:
-	$(CC) $(CFLAGS) -c $<
-
 install:	all
 	$(INSTALL) -d -g $(GROUP) -o $(OWNER) -m 0755 $(PREFIX) $(PREFIX)/bin $(PREFIX)/lib $(PREFIX)/include $(PREFIX)/etc $(PREFIX)/doc
 	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 0644 include/*.h $(PREFIX)/include 

smmapdfw/configure.ac

@@ -26,19 +26,21 @@ AC_CHECK_LIB([socket], [connect])
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/socket.h syslog.h unistd.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/socket.h syslog.h unistd.h dlfcn.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
+AC_CHECK_TYPES(socklen_t)
 
 # Checks for library functions.
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([inet_ntoa memset select socket strchr strdup strerror strrchr strtol])
+AC_CHECK_FUNCS([inet_ntoa memset select socket strchr strdup strerror strrchr strtol dlopen dlsym dlerror], [],
+               [AC_MSG_ERROR([*** missing function, we can't go without it])])
 
 
 

smmapdfw/include/sunos_comp.h

@@ -1,10 +1,20 @@
 #ifndef _SUNOS_COMP_H_
 #define _SUNOS_COMP_H_
 
-#define socklen_t size_t
-#define isblank(A) ((A==' ') || (A=='\t'))
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 
+
+#ifndef HAVE_SOCKLEN_T
+#define socklen_t size_t
+#endif
+
+#ifndef isblank
+#define isblank(A) ((A==' ') || (A=='\t'))
+#endif
+
 #endif /* _SUNOS_COMP_H_ */  
 
   

smmapdfw/libsmmapdfw/cfg.c

@@ -1,12 +1,22 @@
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+
+
 #include <stdio.h>
+
+#if STDC_HEADERS
 #include <stdlib.h>
+#endif
+
+#if HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
 
 #include "cfg.h"
 
-#ifdef SUNOS
 #include "sunos_comp.h"
-#endif
 
 #define LF 10
 

smmapdfw/libsmmapdfw/config_public.c

@@ -1,4 +1,12 @@
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+
 #include "cfg.h"
 
 char *findcfgl(config_item_t *cfg, char *name) {

smmapdfw/rules.mk.in

@@ -1,5 +1,5 @@
 CC=@CC@
-CFLAGS=-I../include @CFLAGS@ @DEFS@
+CFLAGS=-I.. -I../include @CFLAGS@ @DEFS@
 LIBS=@LIBS@
 INSTALL=@INSTALL@
 

smmapdfw/smmapd/containers.c

@@ -1,7 +1,22 @@
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#if HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
+
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+
+#if STDC_HEADERS
 #include <stdlib.h>
+#endif
+
+#if HAVE_DLFCN_H
 #include <dlfcn.h>
+#endif
 
 #include "containers.h"
 #include "cfg.h"

smmapdfw/smmapd/smmapd.c

@@ -1,14 +1,40 @@
-#include <stdio.h>
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+
+
+#if HAVE_STRING_H
 #include <string.h>
+#endif
+
+#if STDC_HEADERS
 #include <stdlib.h>
+#endif
+
+#if HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
+
+#if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#if HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+
 #include <netinet/in.h>
 #include <errno.h>
 #include <pthread.h>
-#include <unistd.h>
-#include <arpa/inet.h>
 #include <assert.h>
+#include <stdio.h>
+
 
 #include "queue.h"
 #include "count.h"