changeset 411 . callweaver

openpbx/trunk/apps/icd/Makefile.in (unified diff)

r395	r411
6	6	icd_module_api.o icd_plugable_fn.o icd_plugable_fn_list.o icd_jabber.o
7	7
8	8	FORDIST = icd_caller.o icd_distributor.o
9
10		# Uncomment YES or NO for apr support or just touch .apr file in the icd src dir.
11		#USE_APR=YES
12		#USE_APR=NO
13		USE_APR=$(shell if [ -f .apr ] ; then echo YES ; else echo NO ; fi )
	9	LOUDMOUTH_CFLAGS=@LOUDMOUTH_CFLAGS@
	10	LOUDMOUTH_LIBS=@LOUDMOUTH_LIBS@
	11	USE_APR=NO
14	12	# Uncomment to print every malloc/dealloc when apr mode is active
15	13	#CFLAGS += -DICD_APR_DEBUG
16	14
17
18
19		CFLAGS += $(shell if [ -f $(APR_CONFIG) ] && [ $(USE_APR) = "YES" ] ; then $(APR_CONFIG) --cflags --includes ; fi )
20		CFLAGS += $(shell if [ -f $(APR_CONFIG) ] && [ $(USE_APR) = "YES" ] ; then echo -DUSE_APR ; fi )
21		LDFLAGS += $(shell if [ -f $(APR_CONFIG) ] && [ $(USE_APR) = "YES" ] ; then $(APR_CONFIG) --link-ld --libs ; fi )
22		OBJS += $(shell if [ -f $(APR_CONFIG) ] && [ $(USE_APR) = "YES" ] ; then echo icd_apr.o ; fi )
23	15	# where is the asterisk source tree
24	16	ASTSRC = @TOPDIR@
25	17
---	---
31	23	CFLAGS += -O0 -ggdb
32	24	CFLAGS += -Wall
33	25	#CFLAGS += -DNDEBUG
	26	CFLAGS+=$(LOUDMOUTH_CFLAGS)
	27	LIBS+=$(LOUDMOUTH_LIBS)
34	28
35	29	DYNA=$(shell echo icd_mod_*.c \| sed "s/\.c/\.so/g" )
36	30
---	---
39	33
40	34	%.o: %.c
41	35	@echo -n " ===> Compile:" `pwd` ; echo "/$< ($@)"
42		@$(CC) -fPIC $(CFLAGS) `pkg-config --cflags loudmouth-1.0` -c -o $@ $<
	36	@$(CC) -fPIC $(CFLAGS) -c -o $@ $<
43	37
44	38
45	39	app_icd.so: $(OBJS)
46	40	@echo " ===> Linking: >> $(OBJS) << ($@)"
47		@$(CC) -fPIC -Xlinker -x -o $@ $(OBJS) `pkg-config --cflags --libs loudmouth-1.0` -lpthread $(LDFLAGS)
	41	@$(CC) -fPIC -Xlinker -x -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
48	42
49	43
50	44	config_if_none:

openpbx/trunk/apps/icd/configure (unified diff)

r404	r411
311	311	# include <unistd.h>
312	312	#endif"
313	313
314		ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE apr-config CPP EGREP LIBOBJS LTLIBOBJS'
	314	ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE apr-config PKG_CONFIG LOUDMOUTH_CFLAGS LOUDMOUTH_LIBS CPP EGREP LIBOBJS LTLIBOBJS'
315	315	ac_subst_files=''
316	316
317	317	# Initialize some variables set by options.
---	---
2412	2412	done
2413	2413
2414	2414
	2415
	2416	succeeded=no
	2417
	2418	if test -z "$PKG_CONFIG"; then
	2419	# Extract the first word of "pkg-config", so it can be a program name with args.
	2420	set dummy pkg-config; ac_word=$2
	2421	echo "$as_me:$LINENO: checking for $ac_word" >&5
	2422	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
	2423	if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
	2424	echo $ECHO_N "(cached) $ECHO_C" >&6
	2425	else
	2426	case $PKG_CONFIG in
	2427	[\\/]* \| ?:[\\/]*)
	2428	ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
	2429	;;
	2430	*)
	2431	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	2432	for as_dir in $PATH
	2433	do
	2434	IFS=$as_save_IFS
	2435	test -z "$as_dir" && as_dir=.
	2436	for ac_exec_ext in '' $ac_executable_extensions; do
	2437	if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
	2438	ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
	2439	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
	2440	break 2
	2441	fi
	2442	done
	2443	done
	2444
	2445	test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
	2446	;;
	2447	esac
	2448	fi
	2449	PKG_CONFIG=$ac_cv_path_PKG_CONFIG
	2450
	2451	if test -n "$PKG_CONFIG"; then
	2452	echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
	2453	echo "${ECHO_T}$PKG_CONFIG" >&6
	2454	else
	2455	echo "$as_me:$LINENO: result: no" >&5
	2456	echo "${ECHO_T}no" >&6
	2457	fi
	2458
	2459	fi
	2460
	2461	if test "$PKG_CONFIG" = "no" ; then
	2462	echo "*** The pkg-config script could not be found. Make sure it is"
	2463	echo "*** in your path, or set the PKG_CONFIG environment variable"
	2464	echo "*** to the full path to pkg-config."
	2465	echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
	2466	pkg-config."
	2467	else
	2468	PKG_CONFIG_MIN_VERSION=0.9.0
	2469	if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
	2470	echo "$as_me:$LINENO: checking for loudmouth-1.0 >= 1.0.0" >&5
	2471	echo $ECHO_N "checking for loudmouth-1.0 >= 1.0.0... $ECHO_C" >&6
	2472
	2473	if $PKG_CONFIG --exists "loudmouth-1.0 >= 1.0.0" ; then
	2474	echo "$as_me:$LINENO: result: yes" >&5
	2475	echo "${ECHO_T}yes" >&6
	2476	succeeded=yes
	2477
	2478	echo "$as_me:$LINENO: checking LOUDMOUTH_CFLAGS" >&5
	2479	echo $ECHO_N "checking LOUDMOUTH_CFLAGS... $ECHO_C" >&6
	2480	LOUDMOUTH_CFLAGS=`$PKG_CONFIG --cflags "loudmouth-1.0 >= 1.0.0"`
	2481	echo "$as_me:$LINENO: result: $LOUDMOUTH_CFLAGS" >&5
	2482	echo "${ECHO_T}$LOUDMOUTH_CFLAGS" >&6
	2483
	2484	echo "$as_me:$LINENO: checking LOUDMOUTH_LIBS" >&5
	2485	echo $ECHO_N "checking LOUDMOUTH_LIBS... $ECHO_C" >&6
	2486	LOUDMOUTH_LIBS=`$PKG_CONFIG --libs "loudmouth-1.0 >= 1.0.0"`
	2487	echo "$as_me:$LINENO: result: $LOUDMOUTH_LIBS" >&5
	2488	echo "${ECHO_T}$LOUDMOUTH_LIBS" >&6
	2489	else
	2490	LOUDMOUTH_CFLAGS=""
	2491	LOUDMOUTH_LIBS=""
	2492	echo "$as_me:$LINENO: result: no" >&5
	2493	echo "${ECHO_T}no" >&6
	2494	fi
	2495
	2496
	2497
	2498	else
	2499	echo "*** Your version of pkg-config is too old. You need version
	2500	$PKG_CONFIG_MIN_VERSION or newer."
	2501	echo "*** See http://www.freedesktop.org/software/pkgconfig";
	2502	fi
	2503	fi
	2504
	2505	if test $succeeded = yes; then
	2506	:
	2507	else
	2508	{ { echo "$as_me:$LINENO: error: Library requirements (loudmouth-1.0 >= 1.0.0) not met; consider
	2509	adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a
	2510	nonstandard prefix so pkg-config can find them." >&5
	2511	echo "$as_me: error: Library requirements (loudmouth-1.0 >= 1.0.0) not met; consider
	2512	adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a
	2513	nonstandard prefix so pkg-config can find them." >&2;}
	2514	{ (exit 1); exit 1; }; }
	2515	fi
	2516
2415	2517	# Checks for libraries.
2416	2518	# FIXME: Replace `main' with a function in `-ldl':
2417	2519
---	---
4836	4938	s,@INSTALL_DATA@,$INSTALL_DATA,;t t
4837	4939	s,@SET_MAKE@,$SET_MAKE,;t t
4838	4940	s,@apr-config@,$apr-config,;t t
	4941	s,@PKG_CONFIG@,$PKG_CONFIG,;t t
	4942	s,@LOUDMOUTH_CFLAGS@,$LOUDMOUTH_CFLAGS,;t t
	4943	s,@LOUDMOUTH_LIBS@,$LOUDMOUTH_LIBS,;t t
4839	4944	s,@CPP@,$CPP,;t t
4840	4945	s,@EGREP@,$EGREP,;t t
4841	4946	s,@LIBOBJS@,$LIBOBJS,;t t

openpbx/trunk/apps/icd/configure.ac (unified diff)

r404	r411
11	11	AC_PROG_INSTALL
12	12	AC_PROG_MAKE_SET
13	13	AC_PATH_PROGS([apr-config])
	14	AC_DEFUN(PKG_CHECK_MODULES, [
	15	succeeded=no
14	16
	17	if test -z "$PKG_CONFIG"; then
	18	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
	19	fi
	20
	21	if test "$PKG_CONFIG" = "no" ; then
	22	echo "*** The pkg-config script could not be found. Make sure it is"
	23	echo "*** in your path, or set the PKG_CONFIG environment variable"
	24	echo "*** to the full path to pkg-config."
	25	echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get
	26	pkg-config."
	27	else
	28	PKG_CONFIG_MIN_VERSION=0.9.0
	29	if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
	30	AC_MSG_CHECKING(for $2)
	31
	32	if $PKG_CONFIG --exists "$2" ; then
	33	AC_MSG_RESULT(yes)
	34	succeeded=yes
	35
	36	AC_MSG_CHECKING($1_CFLAGS)
	37	$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
	38	AC_MSG_RESULT($$1_CFLAGS)
	39
	40	AC_MSG_CHECKING($1_LIBS)
	41	$1_LIBS=`$PKG_CONFIG --libs "$2"`
	42	AC_MSG_RESULT($$1_LIBS)
	43	else
	44	$1_CFLAGS=""
	45	$1_LIBS=""
	46	AC_MSG_RESULT([no])
	47	fi
	48
	49	AC_SUBST($1_CFLAGS)
	50	AC_SUBST($1_LIBS)
	51	else
	52	echo "*** Your version of pkg-config is too old. You need version
	53	$PKG_CONFIG_MIN_VERSION or newer."
	54	echo "*** See http://www.freedesktop.org/software/pkgconfig";
	55	fi
	56	fi
	57
	58	if test $succeeded = yes; then
	59	ifelse([$3], , :, [$3])
	60	else
	61	ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider
	62	adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a
	63	nonstandard prefix so pkg-config can find them.]), [$4])
	64	fi
	65	])
	66	PKG_CHECK_MODULES([LOUDMOUTH],loudmouth-1.0 >= 1.0.0)
15	67	# Checks for libraries.
16	68	# FIXME: Replace `main' with a function in `-ldl':
17	69	AC_CHECK_LIB([dl], [main])

Affected files:

openpbx/trunk/apps/icd/Makefile.in (unified diff)

openpbx/trunk/apps/icd/configure (unified diff)

openpbx/trunk/apps/icd/configure.ac (unified diff)