提交 3a5caedd authored 作者: Anthony Minessale's avatar Anthony Minessale

move pcre into core do a ./configure again

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2211 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 272c6c9f
...@@ -130,7 +130,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs ...@@ -130,7 +130,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
lib_LTLIBRARIES = libfreeswitch.la lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 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 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
bin_PROGRAMS = freeswitch bin_PROGRAMS = freeswitch
...@@ -171,6 +171,7 @@ depends: ...@@ -171,6 +171,7 @@ depends:
./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX)
./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX)
rm build/freeswitch.env rm build/freeswitch.env
......
...@@ -348,7 +348,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs ...@@ -348,7 +348,7 @@ CLEANFILES = src/include/switch_version.h scripts/fsxs
lib_LTLIBRARIES = libfreeswitch.la lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 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 nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h
bin_SCRIPTS = scripts/fsxs bin_SCRIPTS = scripts/fsxs
freeswitch_SOURCES = src/switch.c\ freeswitch_SOURCES = src/switch.c\
...@@ -805,7 +805,7 @@ distclean-tags: ...@@ -805,7 +805,7 @@ distclean-tags:
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
mkdir -p $(distdir) mkdir $(distdir)
$(mkdir_p) $(distdir)/build/config $(distdir)/src/include $(mkdir_p) $(distdir)/build/config $(distdir)/src/include
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
...@@ -1091,6 +1091,7 @@ depends: ...@@ -1091,6 +1091,7 @@ depends:
./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX)
./build/buildlib.sh . install srtp --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX)
./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX)
./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX)
rm build/freeswitch.env rm build/freeswitch.env
modules: $(NAME) modules: $(NAME)
......
LDFLAGS += -lpcre -L/usr/local/lib LDFLAGS += -L/usr/local/lib
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
depends: depends:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX)
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论