snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

libdockapp: Remove AC_PATH_XTRA macro from configure.ac

Browse source 
We already check for libraries with the PKG_CHECK_MODULES macros.  This also
allows the Debian package to drop the Build-Depend on libice-dev.

Based on the Debian patch [1].

[1] https://sources.debian.net/src/libdockapp/1:0.7.1-1/debian/patches/remove_AC_PATH_XTRA.diff/
This commit is contained in:
Doug Torrance 2015-10-21 07:10:12 -04:00 committed by Carlos R. Mafra
parent 79685780ff
commit ee44bd28c4
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libdockapp/configure.ac
View file

@ -25,8 +25,6 @@ AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
dnl Checks for libraries. dnl Checks for libraries.
AC_PATH_XTRA
PKG_CHECK_MODULES([X11],[x11]) PKG_CHECK_MODULES([X11],[x11])
PKG_CHECK_MODULES([Xext],[xext]) PKG_CHECK_MODULES([Xext],[xext])
PKG_CHECK_MODULES([xpm],[xpm]) PKG_CHECK_MODULES([xpm],[xpm])

4
libdockapp/src/Makefile.am
View file

@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = no-dependencies
lib_LTLIBRARIES = libdockapp.la lib_LTLIBRARIES = libdockapp.la
libdockapp_la_LDFLAGS = -version-info 3:0:0 @X_LIBS@ libdockapp_la_LDFLAGS = -version-info 3:0:0
otherincludedir = $(includedir)/libdockapp otherincludedir = $(includedir)/libdockapp
otherinclude_HEADERS = dockapp.h \ otherinclude_HEADERS = dockapp.h \
@ -30,7 +30,7 @@ libdockapp_la_SOURCES = \
noinst_HEADERS = daargs.h dautil.h noinst_HEADERS = daargs.h dautil.h
AM_CFLAGS = $(X11_CFLAGS) $(Xext_CFLAGS) $(xpm_CFLAGS) AM_CFLAGS = $(X11_CFLAGS) $(Xext_CFLAGS) $(xpm_CFLAGS)
AM_CPPFLAGS = @X_CFLAGS@ @CPPFLAGS@ @DFLAGS@ AM_CPPFLAGS = @CPPFLAGS@ @DFLAGS@
LIBS += $(X11_LIBS) $(Xext_LIBS) $(xpm_LIBS) LIBS += $(X11_LIBS) $(Xext_LIBS) $(xpm_LIBS)
LIBLIST = libdockapp.la @XLIBS@ LIBLIST = libdockapp.la @XLIBS@