Allow to use a different pkg-config program (issue #102) (#104)

2 files changed, 27 insertions, 23 deletions

diff --git a/Makefile.base.mk b/Makefile.base.mk
index 1839635a..5a64f5ea 100644
--- a/Makefile.base.mk
+++ b/Makefile.base.mk
@@ -46,6 +46,16 @@ endif
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
+# Set PKG_CONFIG (can be overridden by environment variable)
+
+ifeq ($(WINDOWS),true)
+# Build statically on Windows by default
+PKG_CONFIG ?= pkg-config --static
+else
+PKG_CONFIG ?= pkg-config
+endif
+
+# ---------------------------------------------------------------------------------------------------------------------
 # Set LINUX_OR_MACOS
 
 ifeq ($(LINUX),true)
@@ -178,35 +188,35 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Check for required libraries
 
-HAVE_CAIRO  = $(shell pkg-config --exists cairo && echo true)
+HAVE_CAIRO  = $(shell $(PKG_CONFIG) --exists cairo && echo true)
 
 ifeq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
 HAVE_OPENGL = true
 else
-HAVE_OPENGL = $(shell pkg-config --exists gl && echo true)
-HAVE_X11    = $(shell pkg-config --exists x11 && echo true)
+HAVE_OPENGL = $(shell $(PKG_CONFIG) --exists gl && echo true)
+HAVE_X11    = $(shell $(PKG_CONFIG) --exists x11 && echo true)
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Check for optional libraries
 
-HAVE_JACK  = $(shell pkg-config --exists jack && echo true)
-HAVE_LIBLO = $(shell pkg-config --exists liblo && echo true)
+HAVE_JACK  = $(shell $(PKG_CONFIG) --exists jack && echo true)
+HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true)
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set Generic DGL stuff
 
 ifeq ($(MACOS),true)
-DGL_SYSTEM_LIBS   += -framework Cocoa
+DGL_SYSTEM_LIBS  += -framework Cocoa
 endif
 
 ifeq ($(WINDOWS),true)
-DGL_SYSTEM_LIBS   += -lgdi32
+DGL_SYSTEM_LIBS  += -lgdi32
 endif
 
 ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-DGL_FLAGS         += $(shell pkg-config --cflags x11)
-DGL_SYSTEM_LIBS   += $(shell pkg-config --libs x11)
+DGL_FLAGS        += $(shell $(PKG_CONFIG) --cflags x11)
+DGL_SYSTEM_LIBS  += $(shell $(PKG_CONFIG) --libs x11)
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -216,14 +226,8 @@ ifeq ($(HAVE_CAIRO),true)
 
 DGL_FLAGS   += -DHAVE_CAIRO
 
-ifneq ($(WINDOWS),true)
-CAIRO_FLAGS  = $(shell pkg-config --cflags cairo)
-CAIRO_LIBS   = $(shell pkg-config --libs cairo)
-else
-# Always build statically on windows
-CAIRO_FLAGS  = $(shell pkg-config --static --cflags cairo)
-CAIRO_LIBS   = $(shell pkg-config --static --libs cairo)
-endif
+CAIRO_FLAGS  = $(shell $(PKG_CONFIG) --cflags cairo)
+CAIRO_LIBS   = $(shell $(PKG_CONFIG) --libs cairo)
 
 HAVE_CAIRO_OR_OPENGL = true
 
@@ -245,8 +249,8 @@ OPENGL_LIBS  = -lopengl32
 endif
 
 ifneq ($(MACOS_OR_WINDOWS),true)
-OPENGL_FLAGS = $(shell pkg-config --cflags gl x11)
-OPENGL_LIBS  = $(shell pkg-config --libs gl x11)
+OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11)
+OPENGL_LIBS  = $(shell $(PKG_CONFIG) --libs gl x11)
 endif
 
 HAVE_CAIRO_OR_OPENGL = true
diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk
index 204c07ff..4afe6b40 100644
--- a/Makefile.plugins.mk
+++ b/Makefile.plugins.mk
@@ -145,12 +145,12 @@ $(BUILD_DIR)/DistrhoUIMain_%.cpp.o: $(DPF_PATH)/distrho/DistrhoUIMain.cpp
 $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o: $(DPF_PATH)/distrho/DistrhoPluginMain.cpp
 	-@mkdir -p $(BUILD_DIR)
 	@echo "Compiling DistrhoPluginMain.cpp (JACK)"
-	@$(CXX) $< $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags jack) -DDISTRHO_PLUGIN_TARGET_JACK -c -o $@
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(shell $(PKG_CONFIG) --cflags jack) -DDISTRHO_PLUGIN_TARGET_JACK -c -o $@
 
 $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o: $(DPF_PATH)/distrho/DistrhoUIMain.cpp
 	-@mkdir -p $(BUILD_DIR)
 	@echo "Compiling DistrhoUIMain.cpp (DSSI)"
-	@$(CXX) $< $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags liblo) -DDISTRHO_PLUGIN_TARGET_DSSI -c -o $@
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(shell $(PKG_CONFIG) --cflags liblo) -DDISTRHO_PLUGIN_TARGET_DSSI -c -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # JACK
@@ -164,7 +164,7 @@ $(jack): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o
 endif
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating JACK standalone for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs jack) -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell $(PKG_CONFIG) --libs jack) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # LADSPA
@@ -191,7 +191,7 @@ $(dssi_dsp): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_DSSI.cpp.o
 $(dssi_ui): $(OBJS_UI) $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o $(DGL_LIB)
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating DSSI UI for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs liblo) -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell $(PKG_CONFIG) --libs liblo) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # LV2