From 860622610c3ea6a455ba21e365aaa9709ccf00b0 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 11 Mar 2007 14:31:27 +0000 Subject: [PATCH] we need to try a bit harder to find apr now that we are not installing it git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4551 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/libdingaling/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/libdingaling/Makefile.am b/libs/libdingaling/Makefile.am index c824fe7537..96ab8afea0 100644 --- a/libs/libdingaling/Makefile.am +++ b/libs/libdingaling/Makefile.am @@ -6,21 +6,22 @@ PREFIX=$(prefix) AM_CFLAGS = $(new_AM_CFLAGS) -I./src -I$(prefix)/include AM_CPPFLAGS = $(AM_CFLAGS) -AM_LDFLAGS = $(new_AM_LDFLAGS) -liksemel +AM_LDFLAGS = $(new_AM_LDFLAGS) -APR_CONFIG=$(prefix)/bin/apr-1-config -APU_CONFIG=$(prefix)/bin/apu-1-config +APR_CONFIG= $(shell which ../apr/apr-1-config || which $(prefix)/bin/apr-1-config ) +APU_CONFIG= $(shell which ../apr-util/apu-1-config || which $(prefix)/bin/apu-1-config) AM_CFLAGS += -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags --cppflags --includes) AM_LDFLAGS += -L$(PREFIX)/lib AM_LDFLAGS += $(shell $(APR_CONFIG) --link-ld --libs ) AM_CFLAGS += $(shell $(APU_CONFIG) --includes) AM_LDFLAGS += $(shell $(APU_CONFIG) --link-ld --libs ) +AM_CFLAGS += -I../iksemel/include +AM_LDFLAGS += ../iksemel/src/libiksemel.la lib_LTLIBRARIES = libdingaling.la libdingaling_la_SOURCES = src/libdingaling.c src/sha1.c libdingaling_la_CFLAGS = $(AM_CFLAGS) libdingaling_la_LDFLAGS = - library_includedir = $(prefix)/include library_include_HEADERS = src/libdingaling.h