kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-14 04:54:49 +00:00
Code Issues Projects Releases Wiki Activity

some tweaks for building and linking in place before install

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4538 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-03-11 10:30:12 +00:00
parent 3380ee98f8
commit 4852afdaf3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/js/Makefile.in
View File

@ -51,6 +51,7 @@ CLI_CFLAGS = @CLI_CFLAGS@
CLI_CPPFLAGS = @CLI_CPPFLAGS@ CLI_CPPFLAGS = @CLI_CPPFLAGS@
CLI_LDFLAGS = @CLI_LDFLAGS@ CLI_LDFLAGS = @CLI_LDFLAGS@
CLI_LIBS = @CLI_LIBS@ CLI_LIBS = @CLI_LIBS@
LIBPATH = @LIBPATH@
RM = rm -f RM = rm -f
CP = cp CP = cp
@ -168,7 +169,7 @@ src/perlconnect/jsperl.o: src/perlconnect/jsperl.c
$(LIB_OBJS): src/jsautocfg.h $(LIB_OBJS): src/jsautocfg.h
src/jsautocfg.h: jscpucfg src/jsautocfg.h: jscpucfg
-rm -f $@ src/jsautocfg.h -rm -f $@ src/jsautocfg.h
$(LIBTOOL) --mode=execute ./jscpucfg >src/jsautocfg.h $(LIBPATH) $(LIBTOOL) --mode=execute ./jscpucfg >src/jsautocfg.h
jscpucfg.o: src/jscpucfg.c jscpucfg.o: src/jscpucfg.c
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
jscpucfg: jscpucfg.o jscpucfg: jscpucfg.o

6
libs/js/configure.ac
View File

@ -169,8 +169,9 @@ AC_ARG_WITH(nspr,
AC_CACHE_CHECK([whether to build with NSPR], [ac_cv_with_nspr], [ac_cv_with_nspr=no]) AC_CACHE_CHECK([whether to build with NSPR], [ac_cv_with_nspr], [ac_cv_with_nspr=no])
if test ".$ac_cv_with_nspr" = ".yes"; then if test ".$ac_cv_with_nspr" = ".yes"; then
sinclude(nsprpub/config/nspr.m4) sinclude(nsprpub/config/nspr.m4)
CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr -Insprpub/pr/include"
LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" LDFLAGS="$LDFLAGS -L$prefix/lib -L./nsprpub/dist/lib -lnspr4"
LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib"
fi fi
AC_SUBST(CLI_CFLAGS) AC_SUBST(CLI_CFLAGS)
@ -178,6 +179,7 @@ AC_SUBST(CLI_CPPFLAGS)
AC_SUBST(CLI_LDFLAGS) AC_SUBST(CLI_LDFLAGS)
AC_SUBST(CLI_LIBS) AC_SUBST(CLI_LIBS)
AC_SUBST(CLI_OBJS) AC_SUBST(CLI_OBJS)
AC_SUBST(LIBPATH)
with_tags="" with_tags=""
sinclude(libtool.m4) sinclude(libtool.m4)

6
libs/js/nsprpub/configure.in
View File

@ -35,7 +35,7 @@ dnl may use your version of this file under either the MPL or the
dnl GPL. dnl GPL.
dnl dnl
AC_PREREQ(2.12) AC_PREREQ(2.59)
AC_INIT(config/libc_r.h) AC_INIT(config/libc_r.h)
AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
@ -405,8 +405,8 @@ if test "$target" != "$host"; then
AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
AC_TRY_COMPILE([], [return(0);], AC_TRY_COMPILE([], [return(0);],
[ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])], [ac_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])],
AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) ) [AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.])] )
CC=$_SAVE_CC CC=$_SAVE_CC
CFLAGS=$_SAVE_CFLAGS CFLAGS=$_SAVE_CFLAGS