From 19b751fae5d1f22ae19d7d7cc565de27c48457b3 Mon Sep 17 00:00:00 2001
From: Dan Egnor <egnor@ofb.net>
Date: Mon, 31 Jan 2000 05:56:34 +0000
Subject: [PATCH] 0.91b changes
---
COPYING | 6 ------
Makefile.am | 6 +-----
Makefile.in | 7 +------
adns.c | 4 ++++
configure | 2 +-
configure.in | 2 +-
glib.c | 4 ++++
www.c | 4 ++++
8 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/COPYING b/COPYING
index 18a090c..2fbbbb1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,9 +1,3 @@
- Most of liboop is covered under the Lesser GPL (below).
-
-** However, the contents of the "foreign" directory may have their own
-** license agreements. See foreign/README for details.
-
--------------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
diff --git a/Makefile.am b/Makefile.am
index 0d08d8e..a8c2244 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
AUTOMAKE_OPTIONS = foreign 1.2
lib_LTLIBRARIES = liboop.la liboop-adns.la liboop-glib.la liboop-www.la
-INCLUDES = $(GLIB_INCLUDES) $(WWW_INCLUDES) -I$(top_srcdir)/foreign
+INCLUDES = $(GLIB_INCLUDES) $(WWW_INCLUDES)
# versions updated as of 0.4
@@ -31,10 +31,6 @@ noinst_PROGRAMS = test-oop
test_oop_SOURCES = test-oop.c
test_oop_LDADD = $(ADNS_LIBS) $(GLIB_LIBS) $(WWW_LIBS) liboop.la
-dist-hook:
- mkdir $(distdir)/foreign
- cp -p $(srcdir)/foreign/README $(srcdir)/foreign/*.h $(distdir)/foreign
-
release: dist
gzip -dc $(PACKAGE)-$(VERSION).tar.gz | bzip2 -9 \
> $(PACKAGE)-$(VERSION).tar.bz2
diff --git a/Makefile.in b/Makefile.in
index b3a858c..2a3c2c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,7 +87,7 @@ WWW_LIBS = @WWW_LIBS@
AUTOMAKE_OPTIONS = foreign 1.2
lib_LTLIBRARIES = liboop.la liboop-adns.la liboop-glib.la liboop-www.la
-INCLUDES = $(GLIB_INCLUDES) $(WWW_INCLUDES) -I$(top_srcdir)/foreign
+INCLUDES = $(GLIB_INCLUDES) $(WWW_INCLUDES)
# versions updated as of 0.4
@@ -350,7 +350,6 @@ distdir: $(DISTFILES)
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
@@ -469,10 +468,6 @@ mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-dist-hook:
- mkdir $(distdir)/foreign
- cp -p $(srcdir)/foreign/README $(srcdir)/foreign/*.h $(distdir)/foreign
-
release: dist
gzip -dc $(PACKAGE)-$(VERSION).tar.gz | bzip2 -9 \
> $(PACKAGE)-$(VERSION).tar.bz2
diff --git a/adns.c b/adns.c
index 69ec6ae..4b6abfc 100644
--- a/adns.c
+++ b/adns.c
@@ -4,6 +4,8 @@
terms of the GNU Lesser General Public License, version 2.1 or later.
See the file COPYING for details. */
+#ifdef HAVE_ADNS
+
#include "oop.h"
#include "adns.h"
#include "oop-adns.h"
@@ -141,3 +143,5 @@ static void *on_select(
adns_afterselect(a->state,num,rfd,wfd,&xfd,&now);
return on_process(a->source,OOP_TIME_NOW,a);
}
+
+#endif
diff --git a/configure b/configure
index 2e25bfb..70ea927 100755
--- a/configure
+++ b/configure
@@ -701,7 +701,7 @@ fi
PACKAGE=liboop
-VERSION=0.4
+VERSION=0.5
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index 065235d..5a40199 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(INSTALL)
-AM_INIT_AUTOMAKE(liboop,0.4)
+AM_INIT_AUTOMAKE(liboop,0.5)
AC_CANONICAL_HOST
dnl Use libtool for shared libraries
diff --git a/glib.c b/glib.c
index 5c89eb0..d96d7df 100644
--- a/glib.c
+++ b/glib.c
@@ -4,6 +4,8 @@
terms of the GNU Lesser General Public License, version 2.1 or later.
See the file COPYING for details. */
+#ifdef HAVE_GLIB
+
#include "glib.h"
#include "oop-glib.h"
#include "oop.h"
@@ -105,3 +107,5 @@ void oop_glib_delete() {
g_main_set_poll_func(real_poll);
}
#endif
+
+#endif
diff --git a/www.c b/www.c
index 3ae6eb7..e7c9f0f 100644
--- a/www.c
+++ b/www.c
@@ -4,6 +4,8 @@
terms of the GNU Lesser General Public License, version 2.1 or later.
See the file COPYING for details. */
+#ifdef HAVE_WWW
+
/* Yecch: the libwww header files need this. */
#define HAVE_CONFIG_H
#undef PACKAGE
@@ -183,3 +185,5 @@ void oop_www_memory() {
oop_malloc = HTMemory_malloc;
oop_free = HTMemory_free;
}
+
+#endif
--
GitLab