Author: mikej Date: Sun Mar 11 06:30:12 2007 New Revision: 4538 Modified: freeswitch/trunk/libs/js/Makefile.in freeswitch/trunk/libs/js/configure.ac freeswitch/trunk/libs/js/nsprpub/configure.in Log: some tweaks for building and linking in place before install Modified: freeswitch/trunk/libs/js/Makefile.in ============================================================================== --- freeswitch/trunk/libs/js/Makefile.in (original) +++ freeswitch/trunk/libs/js/Makefile.in Sun Mar 11 06:30:12 2007 @@ -51,6 +51,7 @@ CLI_CPPFLAGS = @CLI_CPPFLAGS@ CLI_LDFLAGS = @CLI_LDFLAGS@ CLI_LIBS = @CLI_LIBS@ +LIBPATH = @LIBPATH@ RM = rm -f CP = cp @@ -168,7 +169,7 @@ $(LIB_OBJS): src/jsautocfg.h src/jsautocfg.h: jscpucfg -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 $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< jscpucfg: jscpucfg.o Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Sun Mar 11 06:30:12 2007 @@ -169,8 +169,9 @@ 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 sinclude(nsprpub/config/nspr.m4) - CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" - LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr -Insprpub/pr/include" + LDFLAGS="$LDFLAGS -L$prefix/lib -L./nsprpub/dist/lib -lnspr4" + LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib" fi AC_SUBST(CLI_CFLAGS) @@ -178,6 +179,7 @@ AC_SUBST(CLI_LDFLAGS) AC_SUBST(CLI_LIBS) AC_SUBST(CLI_OBJS) +AC_SUBST(LIBPATH) with_tags="" sinclude(libtool.m4) Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Sun Mar 11 06:30:12 2007 @@ -35,7 +35,7 @@ dnl GPL. dnl -AC_PREREQ(2.12) +AC_PREREQ(2.59) AC_INIT(config/libc_r.h) AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) @@ -405,8 +405,8 @@ AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) AC_TRY_COMPILE([], [return(0);], - [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_cv_prog_host_cc_works=1; AC_MSG_RESULT([yes])], + [AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.])] ) CC=$_SAVE_CC CFLAGS=$_SAVE_CFLAGS