diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | src/.gitignore | 6 | ||||
| -rw-r--r-- | src/ICElibint.h | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/getauth.c | 4 |
7 files changed, 17 insertions, 21 deletions
@@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache config.guess @@ -21,5 +23,8 @@ stamp-h1 *~ tags *.o +*.lo +*.la libICE-*.tar.* ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 5d3daa9..8e343cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = ice.pc -EXTRA_DIST=ice.pc.in +EXTRA_DIST=ice.pc.in ChangeLog .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index 657a38b..3216b53 100644 --- a/configure.ac +++ b/configure.ac @@ -12,14 +12,20 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros at least 1.2.1 +XORG_MACROS_VERSION([1.2.1]) +m4_ifndef([XORG_MACROS_VERSION], + [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(ICE, xproto) +ICE_CFLAGS="$CWARNFLAGS $ICE_CFLAGS" AC_SUBST(ICE_CFLAGS) AC_SUBST(ICE_LIBS) @@ -36,21 +42,13 @@ AC_DEFINE(ICE_t, 1, [Xtrans transport type]) # Checks for header files. AC_HEADER_STDC -# Require xorg-macros at least 1.2.1 -XORG_MACROS_VERSION([1.2.1]) -m4_ifndef([XORG_MACROS_VERSION], - [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) - dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT XORG_LINT_LIBRARY([ICE]) LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}" -XORG_CHANGELOG - -XORG_CWARNFLAGS - XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index f38c26f..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -libICE.la -.libs -*.lo -Makefile -Makefile.in diff --git a/src/ICElibint.h b/src/ICElibint.h index ca61553..42983cc 100644 --- a/src/ICElibint.h +++ b/src/ICElibint.h @@ -37,6 +37,7 @@ Author: Ralph Mor, X Consortium #include <X11/ICE/ICEproto.h> #include <X11/ICE/ICEconn.h> #include <X11/ICE/ICEmsg.h> +#include <X11/ICE/ICEutil.h> #ifdef WIN32 #include <X11/Xwindows.h> #endif @@ -410,6 +411,8 @@ extern _IceWatchProc *_IceWatchProcs; extern IceErrorHandler _IceErrorHandler; extern IceIOErrorHandler _IceIOErrorHandler; +extern IceAuthDataEntry _IcePaAuthDataEntries[]; +extern int _IcePaAuthDataEntryCount; extern void _IceErrorBadMajor ( IceConn /* iceConn */, diff --git a/src/Makefile.am b/src/Makefile.am index dc4a0f5..449aeaf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ lib_LTLIBRARIES=libICE.la AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS) \ - -DICE_t -DTRANS_CLIENT -DTRANS_SERVER $(CWARNFLAGS) + -DICE_t -DTRANS_CLIENT -DTRANS_SERVER libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined diff --git a/src/getauth.c b/src/getauth.c index 6641512..0e86044 100644 --- a/src/getauth.c +++ b/src/getauth.c @@ -33,14 +33,10 @@ Author: Ralph Mor, X Consortium #endif #include <X11/ICE/ICElib.h> #include "ICElibint.h" -#include <X11/ICE/ICEutil.h> static Bool auth_valid (const char *auth_name, int num_auth_names, char **auth_names, int *index_ret); -extern int _IcePaAuthDataEntryCount; -extern IceAuthDataEntry _IcePaAuthDataEntries[]; - /* * The functions in this file are not a standard part of ICElib. |