Author: mikej Date: Sun Mar 11 10:31:27 2007 New Revision: 4551 Modified: freeswitch/trunk/libs/libdingaling/Makefile.am Log: we need to try a bit harder to find apr now that we are not installing it Modified: freeswitch/trunk/libs/libdingaling/Makefile.am ============================================================================== --- freeswitch/trunk/libs/libdingaling/Makefile.am (original) +++ freeswitch/trunk/libs/libdingaling/Makefile.am Sun Mar 11 10:31:27 2007 @@ -6,21 +6,22 @@ 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