summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-06-21 15:41:36 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2005-06-21 15:41:36 +0000
commit3835ed8e7aac1dfafa02ba6e33273523a6ef139f (patch)
tree991447acc00bafbf90f900ada431fe3d52fafc60
parent2a6c0aa8f36dad9ff49385ef15c3dfc2529483b8 (diff)
downloadxorg-lib-libXinerama-3835ed8e7aac1dfafa02ba6e33273523a6ef139f.tar.gz
lib/XScrnSaver/configure.ac
lib/XScrnSaver/src/Makefile.am lib/Xfontcache/configure.ac lib/Xfontcache/src/Makefile.am lib/Xinerama/configure.ac lib/Xinerama/src/Makefile.am lib/Xtst/configure.ac lib/Xv/configure.ac lib/XvMC/configure.ac lib/dmx/configure.ac Add missing xext.pc and xextproto.pc Add DEP_CFLAGS to src/Makefile.am
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am5
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e69de29..95fd1a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,7 @@
+2005-06-21 Alexander Gottwald <ago at freedesktop dot org>
+
+ * configure.ac
+ * src/Makefile.am
+ Add missing xext.pc and xextproto.pc
+ Add DEPS_CFLAGS to Makefile.am
+
diff --git a/configure.ac b/configure.ac
index ca98feb..9d39dd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_PROG_CC
AC_PROG_LIBTOOL
# Check for dependencies
-PKG_CHECK_MODULES(DEP, x11 panoramixproto)
+PKG_CHECK_MODULES(DEP, x11 xext xextproto panoramixproto)
AC_SUBST(DEP_CFLAGS)
AC_SUBST(DEP_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e08847..0e05067 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,10 @@
+AM_CFLAGS = $(DEP_CFLAGS)
lib_LTLIBRARIES = libXinerama.la
-libXinerama_la_SOURCES = \
+libXinerama_la_SOURCES = \
Xinerama.c
-libXinerama_la_LIBADD = @DEP_LIBS@
+libXinerama_la_LIBADD = $(DEP_LIBS)
libXinerama_la_LDFLAGS = -version-info 7:0:0 -no-undefined