diff options
| author | Keith Packard <keithp@keithp.com> | 2005-07-13 07:28:02 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-07-13 07:28:02 +0000 |
| commit | 9c370ec68d2606468296efc1f0a093c036e8d7ff (patch) | |
| tree | d5b31fd32a8e9025704ebcf29f0d7f97938dd24d | |
| parent | 7b45eec97e390d8c8124b0a95b83ff7614903979 (diff) | |
Eliminate xtrans CFLAGS from .pc file as xtrans is not part of the public
API.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2005-07-13 keith Packard <keithp@keithp.com> + + * configure.ac: + * src/Makefile.am: + Eliminate xtrans CFLAGS from .pc file as xtrans + is not part of the public API. + 2005-07-08 Keith Packard <keithp@keithp.com> * .cvsignore: diff --git a/configure.ac b/configure.ac index 89dba99..b046ca3 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,14 @@ AC_PROG_LIBTOOL AC_PROG_CC # Checks for pkg-config packages -PKG_CHECK_MODULES(SM, ice xproto xtrans) +PKG_CHECK_MODULES(SM, ice xproto) AC_SUBST(SM_CFLAGS) AC_SUBST(SM_LIBS) +PKG_CHECK_MODULES(XTRANS, xtrans) +AC_SUBST(XTRANS_CFLAGS) +AC_SUBST(XTRANS_LIBS) + # Checks for libraries. # Checks for header files. diff --git a/src/Makefile.am b/src/Makefile.am index 678879d..a8b592d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,10 @@ lib_LTLIBRARIES=libSM.la -AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) +AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS) libSM_la_LDFLAGS = -version-info 6:1:0 -no-undefined -libSM_la_LIBADD = $(SM_LIBS) +libSM_la_LIBADD = $(SM_LIBS) $(XTRANS_LIBS) libSM_la_SOURCES = \ SMlibint.h \ |