diff --git a/.gitignore b/.gitignore index 21c6cd392c0dea68db16669ebab61d96077ffafc..dc55d9bd6222bd021e1f0b302749aa6969067ecc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,18 @@ *~ +*.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 diff --git a/Makefile.am b/Makefile.am index fca032f768dce661eeb71a5bfccaec29f9bad414..31152d56c45b197a06ddd18a9bde94d8df07b96e 100644 --- a/Makefile.am +++ b/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)' diff --git a/configure.ac b/configure.ac index 9dafa6d79af74ac20b0e3bc191920a99a8bc09b6..e95956e6f974a28fe8c2e0bfd61939c5a9d16470 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ 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 diff --git a/glib.c b/glib.c index d2b785e86415da8eee78f5430a6d1f3b964777e0..cabc3815f73cd5f7a2c841a027076891835ccb23 100644 --- a/glib.c +++ b/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; diff --git a/select.c b/select.c index edf48a67ad1e34b02120943114f839cf226a69a3..c838b20399ecf843755d66127bd5ed24c8974ea2 100644 --- a/select.c +++ b/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; };