Merge branch 'holmgren/liboop-master'

.gitignore

 *~
+*.o
+*.lo
+*.la
 test-oop
 *.pc
+/.libs
+/.deps
 # autoconf related
 configure
 aclocal.m4
 autom4te.cache
+config.log
+config.status
+Makefile
 # automake related
 Makefile.in
 compile
@@ -12,4 +20,5 @@ config.guess
 config.sub
 depcomp
 ltmain.sh
+libtool
 missing

Makefile.am

@@ -14,7 +14,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = liboop.pc liboop-glib2.pc
 
 # versions updated as of 1.0
-liboop_la_LDFLAGS = -version-info 4:1:0 # version:revision:age
+liboop_la_LDFLAGS = -version-info 5:0:1 # version:revision:age
 liboop_la_SOURCES = sys.c select.c signal.c alloc.c read.c read-fd.c read-mem.c
 
 liboop_adns_la_LDFLAGS = -version-info 3:0:0 -rpath '$(libdir)'

configure.ac

 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(INSTALL)
-AM_INIT_AUTOMAKE(liboop,1.0)
+AM_INIT_AUTOMAKE(liboop,1.0.1)
 AC_CANONICAL_HOST
 AM_PROG_LIBTOOL
 AC_PROG_CC

glib.c

@@ -18,6 +18,14 @@
 #include <poll.h>
 #endif
 
+#ifdef HAVE_STRING_H
+#  include <string.h>	/* Needed on NetBSD1.1/SPARC due to bzero/FD_ZERO. */
+#endif
+
+#ifdef HAVE_STRINGS_H
+#  include <strings.h>  /* Needed on AIX 4.2 due to bzero/FD_ZERO. */
+#endif
+
 static int use_count = 0;
 static oop_source_sys *sys;
 static oop_adapter_select *sel;

select.c

@@ -8,6 +8,14 @@
 
 #include <assert.h>
 
+#ifdef HAVE_STRING_H
+#  include <string.h>	/* Needed on NetBSD1.1/SPARC due to bzero/FD_ZERO. */
+#endif
+
+#ifdef HAVE_STRINGS_H
+#  include <strings.h>  /* Needed on AIX 4.2 due to bzero/FD_ZERO. */
+#endif
+
 struct select_set {
 	fd_set rfd,wfd,xfd;
 };