move pcre into core do a ./configure again

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2211 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index a46399ee4e1ecc83398a66889e30efa6dc6f8dbd..e40b8097c6cc31f5a224a390c328f4b7be71fcd2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
 lib_LTLIBRARIES                = libfreeswitch.la
 libfreeswitch_la_CFLAGS        = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 
 libfreeswitch_la_LDFLAGS       = -version-info 1:0:0
-libfreeswitch_la_LIBADD  = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup
+libfreeswitch_la_LIBADD  = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
 
 bin_PROGRAMS = freeswitch
@@ -171,6 +171,7 @@ depends:
        ./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
        ./build/buildlib.sh . install srtp --prefix=$(PREFIX)
        ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
+       ./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX)
        rm build/freeswitch.env
 
 

diff --git a/Makefile.in b/Makefile.in
index 2f4758edab5387edf1381e03f28bba5053a8473e..96c958d29379a6d7035de523ee2ac0ac66d1fdd5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -348,7 +348,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
 lib_LTLIBRARIES = libfreeswitch.la
 libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0
-libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup
+libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre
 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
 bin_SCRIPTS = scripts/fsxs
 freeswitch_SOURCES = src/switch.c\
@@ -805,7 +805,7 @@ distclean-tags:
 
 distdir: $(DISTFILES)
        $(am__remove_distdir)
-       mkdir -p $(distdir)
+       mkdir $(distdir)
        $(mkdir_p) $(distdir)/build/config $(distdir)/src/include
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -1091,6 +1091,7 @@ depends:
        ./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
        ./build/buildlib.sh . install srtp --prefix=$(PREFIX)
        ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
+       ./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX)
        rm build/freeswitch.env
 
 modules: $(NAME)

diff --git a/src/mod/dialplans/mod_dialplan_xml/Makefile b/src/mod/dialplans/mod_dialplan_xml/Makefile
index 8a769aa0ad554946c36435b263a7c1c2b93b5209..def70d4a0f7b9a616466391d25a49fda75a3684a 100644 (file)
--- a/src/mod/dialplans/mod_dialplan_xml/Makefile
+++ b/src/mod/dialplans/mod_dialplan_xml/Makefile
@@ -1,9 +1,8 @@
-LDFLAGS += -lpcre -L/usr/local/lib
+LDFLAGS += -L/usr/local/lib
 
 all:   depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
 
 depends:
-       MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
        $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o