diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-17 19:49:17 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-17 19:49:17 +0000 |
| commit | a0f44d19aa84965a31303fd39f05631665fd7e37 (patch) | |
| tree | 8892cca46f8d91907d8e34914389b3e7b3d33e83 | |
| parent | 19fd5758771d31d13cc483cf80adafa3bf530132 (diff) | |
Get xthreadlib variable from Xlib. Bump to 0.99.1.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -0,0 +1,5 @@ +2005-08-17 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * Makefile.am: + Get xthreadlib variable from Xlib. Bump to 0.99.1. diff --git a/Makefile.am b/Makefile.am index f3358ab..ac2f492 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = ico ico_CFLAGS = $(ICO_CFLAGS) -ico_LDADD = $(ICO_LIBS) -lm +ico_LDADD = $(ICO_LIBS) $(XTHREADLIB) -lm ico_SOURCES = \ allobjs.h \ diff --git a/configure.ac b/configure.ac index 3b57ffc..d5edba2 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(ico,[0.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],ico) +AC_INIT(ico,[0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],ico) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -32,9 +32,11 @@ AC_PROG_CC AC_PROG_INSTALL # Checks for pkg-config packages -PKG_CHECK_MODULES(ICO, x11) +PKG_CHECK_MODULES(ICO, x11 >= 0.99.1) AC_SUBST(ICO_CFLAGS) AC_SUBST(ICO_LIBS) +XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11` +AC_SUBST(XTHREADLIB) XORG_RELEASE_VERSION |