diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-06-28 17:29:32 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-06-28 17:29:32 +0000 |
| commit | 23ce26f64c34e30951ad9ade2151552ed77e7357 (patch) | |
| tree | d73b31a0c2f7c7be4a69f8a8e84e00dd39c432b5 /other/pamx/Makefile | |
| parent | 1b6e51a266008348ad93ed8b6ac9ec91b5024fea (diff) | |
| download | netpbm-mirror-23ce26f64c34e30951ad9ade2151552ed77e7357.tar.gz netpbm-mirror-23ce26f64c34e30951ad9ade2151552ed77e7357.tar.xz netpbm-mirror-23ce26f64c34e30951ad9ade2151552ed77e7357.zip | |
promote Advanced to Stable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@4558 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'other/pamx/Makefile')
| -rw-r--r-- | other/pamx/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/other/pamx/Makefile b/other/pamx/Makefile index e4892540..7fe7b9db 100644 --- a/other/pamx/Makefile +++ b/other/pamx/Makefile @@ -9,7 +9,10 @@ include $(BUILDDIR)/config.mk EXTERN_INCLUDE = -ifeq ($(shell $(PKG_CONFIG) x11 --modversion --silence-errors),) +TEST_PKGCONFIG_X11 := \ + if $(PKG_CONFIG) x11 --exists; then echo exists; fi + +ifeq ($(shell $(TEST_PKGCONFIG_X11)),) # Pkg-config has never heard of X11, or doesn't even exist ifneq ($(X11LIB),NONE) @@ -46,7 +49,8 @@ all: $(BINARIES) include $(SRCDIR)/common.mk -ifeq ($(shell $(PKG_CONFIG) x11 --libs),) +ifeq ($(shell $(TEST_PKGCONFIG_X11)),) + # Pkg-config has never heard of X11, or doesn't even exist X11_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(X11LIB)) else X11_LIBOPTS = $(shell $(PKG_CONFIG) x11 --libs) |