diff --git a/.gitignore b/.gitignore index cd68ad0..e25920e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.dylib *.o *.so +*.so.* *~ .deps aclocal.m4 diff --git a/autogen.sh b/autogen.sh index 1f47bab..b0d2f71 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,7 +3,7 @@ set -e # Set a version for OpenBSD : ${AUTOCONF_VERSION:=2.69} -: ${AUTOMAKE_VERSION:=1.15} +: ${AUTOMAKE_VERSION:=1.16} export AUTOCONF_VERSION AUTOMAKE_VERSION aclocal -I build-aux/m4 diff --git a/src/Makefile b/src/Makefile index 9dc2647..6f88e00 100644 --- a/src/Makefile +++ b/src/Makefile @@ -37,7 +37,7 @@ INCLUDES = ${SRCS:.m=.h} \ include ../buildsys.mk -CPPFLAGS += -I.. -DHAVE_CONFIG_H +CPPFLAGS += -I.. LD = ${OBJC} FRAMEWORK_LIBS := ${OBJOPENSSL_FRAMEWORK_LIBS} ${OBJFW_FRAMEWORK_LIBS} ${LIBS} LIBS := ${OBJOPENSSL_LIBS} ${OBJFW_LIBS} ${LIBS} diff --git a/src/XMPPAuthenticator.m b/src/XMPPAuthenticator.m index c1b6442..f7501de 100644 --- a/src/XMPPAuthenticator.m +++ b/src/XMPPAuthenticator.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPAuthenticator.h" diff --git a/src/XMPPCallback.m b/src/XMPPCallback.m index 04b191e..638738f 100644 --- a/src/XMPPCallback.m +++ b/src/XMPPCallback.m @@ -20,9 +20,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPCallback.h" diff --git a/src/XMPPConnection.m b/src/XMPPConnection.m index a813991..091f7e8 100644 --- a/src/XMPPConnection.m +++ b/src/XMPPConnection.m @@ -22,9 +22,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #define XMPP_CONNECTION_M diff --git a/src/XMPPEXTERNALAuth.m b/src/XMPPEXTERNALAuth.m index 8cdb0d3..b28c3ef 100644 --- a/src/XMPPEXTERNALAuth.m +++ b/src/XMPPEXTERNALAuth.m @@ -20,9 +20,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPEXTERNALAuth.h" diff --git a/src/XMPPExceptions.m b/src/XMPPExceptions.m index 64f2280..dae8abe 100644 --- a/src/XMPPExceptions.m +++ b/src/XMPPExceptions.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include diff --git a/src/XMPPFileStorage.m b/src/XMPPFileStorage.m index 3472b49..616eb75 100644 --- a/src/XMPPFileStorage.m +++ b/src/XMPPFileStorage.m @@ -20,9 +20,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include diff --git a/src/XMPPIQ.m b/src/XMPPIQ.m index 68cff1f..9dc9852 100644 --- a/src/XMPPIQ.m +++ b/src/XMPPIQ.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "namespaces.h" #import "XMPPIQ.h" diff --git a/src/XMPPJID.m b/src/XMPPJID.m index b23ae33..cb30696 100644 --- a/src/XMPPJID.m +++ b/src/XMPPJID.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include diff --git a/src/XMPPMessage.m b/src/XMPPMessage.m index 91e5117..448b191 100644 --- a/src/XMPPMessage.m +++ b/src/XMPPMessage.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPMessage.h" #import "namespaces.h" diff --git a/src/XMPPMulticastDelegate.m b/src/XMPPMulticastDelegate.m index 2bc7a82..6a180d8 100644 --- a/src/XMPPMulticastDelegate.m +++ b/src/XMPPMulticastDelegate.m @@ -20,9 +20,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import #import diff --git a/src/XMPPPLAINAuth.m b/src/XMPPPLAINAuth.m index 2bf961a..08ba6b6 100644 --- a/src/XMPPPLAINAuth.m +++ b/src/XMPPPLAINAuth.m @@ -20,9 +20,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPPLAINAuth.h" #import "XMPPExceptions.h" diff --git a/src/XMPPPresence.m b/src/XMPPPresence.m index 33bfe98..58f94bc 100644 --- a/src/XMPPPresence.m +++ b/src/XMPPPresence.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include diff --git a/src/XMPPRoster.m b/src/XMPPRoster.m index 59c7408..163c233 100644 --- a/src/XMPPRoster.m +++ b/src/XMPPRoster.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #define XMPP_ROSTER_M diff --git a/src/XMPPRosterItem.m b/src/XMPPRosterItem.m index 3debd30..e4f8d11 100644 --- a/src/XMPPRosterItem.m +++ b/src/XMPPRosterItem.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPRosterItem.h" #import "XMPPJID.h" diff --git a/src/XMPPSCRAMAuth.m b/src/XMPPSCRAMAuth.m index 6549e2a..c21f905 100644 --- a/src/XMPPSCRAMAuth.m +++ b/src/XMPPSCRAMAuth.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include diff --git a/src/XMPPStanza.m b/src/XMPPStanza.m index 47d8bdc..965a3c0 100644 --- a/src/XMPPStanza.m +++ b/src/XMPPStanza.m @@ -21,9 +21,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPStanza.h" #import "XMPPJID.h" diff --git a/src/XMPPXMLElementBuilder.m b/src/XMPPXMLElementBuilder.m index 5df7ebf..ae975cf 100644 --- a/src/XMPPXMLElementBuilder.m +++ b/src/XMPPXMLElementBuilder.m @@ -20,9 +20,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #import "XMPPXMLElementBuilder.h"