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/ --- libdockapp/configure.ac | 2 -- libdockapp/src/Makefile.am | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libdockapp/configure.ac b/libdockapp/configure.ac index cc0ea82..b4513a8 100644 --- a/libdockapp/configure.ac +++ b/libdockapp/configure.ac @@ -25,8 +25,6 @@ AC_PROG_CC AC_PROG_INSTALL dnl Checks for libraries. -AC_PATH_XTRA - PKG_CHECK_MODULES([X11],[x11]) PKG_CHECK_MODULES([Xext],[xext]) PKG_CHECK_MODULES([xpm],[xpm]) diff --git a/libdockapp/src/Makefile.am b/libdockapp/src/Makefile.am index 5196001..de18b8e 100644 --- a/libdockapp/src/Makefile.am +++ b/libdockapp/src/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = no-dependencies 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 otherinclude_HEADERS = dockapp.h \ @@ -30,7 +30,7 @@ libdockapp_la_SOURCES = \ noinst_HEADERS = daargs.h dautil.h 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) LIBLIST = libdockapp.la @XLIBS@ -- 2.1.4 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
