فهرست منبع

carrierroute: fix cross-compilation

Ovidiu Sas 12 سال پیش
والد
کامیت
ebde66ba5f
1فایلهای تغییر یافته به همراه11 افزوده شده و 17 حذف شده
  1. 11 17
      modules/carrierroute/Makefile

+ 11 - 17
modules/carrierroute/Makefile

@@ -10,28 +10,22 @@ auto_gen=
 NAME=carrierroute.so
 
 ifeq ($(CROSS_COMPILE),)
-BUILDER = $(shell which confuse-config)
+CONFUSE_BUILDER = $(shell \
+	if which confuse-config &>/dev/null;then \
+		echo 'confuse-config'; \
+	elif pkg-config --exists libconfuse; then \
+		echo 'pkg-config libconfuse'; \
+	fi)
 endif
 
-ifeq ($(BUILDER),)
-	ifeq ($(CROSS_COMPILE),)
-	BUILDER = $(shell which pkg-config)
-	endif
-	ifeq ($(BUILDER),)
-		CONFUSEDEFS=-I$(LOCALBASE)/include
-		CONFUSELIBS=-L$(LOCALBASE)/lib -lconfuse
-	else
-		CONFUSEDEFS = $(shell pkg-config --cflags libconfuse)
-		CONFUSELIBS = $(shell pkg-config --libs libconfuse)
-	endif
+ifeq ($(CONFUSE_BUILDER),)
+	DEFS += -I$(LOCALBASE)/include
+	LIBS += -L$(LOCALBASE)/lib -lconfuse
 else
-		CONFUSEDEFS = $(shell confuse-config --cflags)
-		CONFUSELIBS = $(shell confuse-config --libs)
+	DEFS += $(shell $(CONFUSE_BUILDER) --cflags)
+	LIBS += $(shell $(CONFUSE_BUILDER) --libs)
 endif
 
-DEFS+=$(CONFUSEDEFS)
-LIBS=$(CONFUSELIBS)
-
 DEFS+=-DKAMAILIO_MOD_INTERFACE
 
 SERLIBPATH=../../lib