pjproject_bundled: Fix use of LDCONFIG for shared library link creation

LDCONFIG apparently isn't set to something sane on all systems so the creation
of the shared library links fails.  Instead of just testing for non-blank,
main/Makefile now checks that LDCONFIG is actually executable and reverts to
LN if it isn't.

This applies to both libasteriskpj and libasteriskssl.

Thanks to 'abelbeck' for pointing out that the issue was LDCONFIG.

ASTERISK-25873 #close
Reported-by: Hans van Eijsden
Change-Id: I25b76379bc637726ec044b2c0e709b56b3701729

diff --git a/main/Makefile b/main/Makefile
index 70b2a390068c1e511c3656a8a7c9ddf1f7d3f4ab..a64eabcdeb4e029c07f563e4753e6c4bb2bf266a 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -224,11 +224,11 @@ endif
 
 $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
        $(ECHO_PREFIX) echo "   [LN] $< -> $@"
-ifneq ($(LDCONFIG),)
-       $(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
-else
-       $(CMD_PREFIX) $(LN) -sf $< $@
-endif
+       $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
+               $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
+       else \
+               $(LN) -sf $< $@ ;\
+       fi
 
 else # Darwin
 ASTSSL_LIB:=libasteriskssl.dylib
@@ -304,11 +304,11 @@ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): libasteriskpj.o libasteriskpj.exports
 
 $(ASTPJ_LIB): $(ASTPJ_LIB).$(ASTPJ_SO_VERSION)
        $(ECHO_PREFIX) echo "   [LN] $< -> $@"
-ifneq ($(LDCONFIG),)
-       $(CMD_PREFIX) $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null
-else
-       $(CMD_PREFIX) $(LN) -sf $< $@
-endif
+       $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
+               $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
+       else \
+               $(LN) -sf $< $@ ;\
+       fi
 
 else # Darwin
 ASTPJ_LIB:=libasteriskpj.dylib