Author: anthm Date: Wed Feb 14 15:48:15 2007 New Revision: 4274 Modified: freeswitch/trunk/libs/js/.update freeswitch/trunk/libs/js/configure freeswitch/trunk/libs/js/configure.ac Log: yet another attempt to properly build with the file object again Modified: freeswitch/trunk/libs/js/.update ============================================================================== --- freeswitch/trunk/libs/js/.update (original) +++ freeswitch/trunk/libs/js/.update Wed Feb 14 15:48:15 2007 @@ -1 +1 @@ -Wed Feb 14 15:20:38 EST 2007 +Wed Feb 14 15:47:43 EST 2007 Modified: freeswitch/trunk/libs/js/configure ============================================================================== --- freeswitch/trunk/libs/js/configure (original) +++ freeswitch/trunk/libs/js/configure Wed Feb 14 15:48:15 2007 @@ -4645,7 +4645,7 @@ echo "$as_me:$LINENO: result: $ac_cv_with_file" >&5 echo "${ECHO_T}$ac_cv_with_file" >&6 if test ".$ac_cv_with_file" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1" fi @@ -5482,7 +5482,7 @@ fi done - CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT=1" CLI_LDFLAGS="$CLI_LDFLAGS -export-dynamic" fi @@ -5504,7 +5504,7 @@ echo "$as_me:$LINENO: result: $ac_cv_with_utf8" >&5 echo "${ECHO_T}$ac_cv_with_utf8" >&6 if test ".$ac_cv_with_utf8" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8" + CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8=1" fi @@ -5532,7 +5532,7 @@ - CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE -Insprpub/dist/include/nspr" + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" fi Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Wed Feb 14 15:48:15 2007 @@ -135,7 +135,7 @@ [ac_cv_with_file=$withval], [ac_cv_with_file=yes]) AC_CACHE_CHECK([whether to build with the File object], [ac_cv_with_file], [ac_cv_with_file=yes]) if test ".$ac_cv_with_file" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_FILE_OBJECT=1" fi dnl # configure option --with-dso @@ -147,7 +147,7 @@ AC_CHECK_LIB(dl, dlopen) AC_CHECK_HEADER(dlfcn.h, , AC_ERROR([dlopen(3) header <dlfcn.h> required])) AC_CHECK_FUNCS(dlopen dlclose dlerror, , AC_ERROR([dlopen(3) API functions dlopen/dlclose/dlerror required])) - CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT" + CPPFLAGS="$CPPFLAGS -DJS_HAS_DSO_OBJECT=1" CLI_LDFLAGS="$CLI_LDFLAGS -export-dynamic" fi @@ -157,7 +157,7 @@ [ac_cv_with_utf8=$withval], [ac_cv_with_utf8=no]) AC_CACHE_CHECK([whether to build with exclusive UTF-8 C string], [ac_cv_with_utf8], [ac_cv_with_utf8=no]) if test ".$ac_cv_with_utf8" = ".yes"; then - CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8" + CPPFLAGS="$CPPFLAGS -DJS_C_STRINGS_ARE_UTF8=1" fi AC_ARG_WITH(nspr, @@ -166,7 +166,7 @@ 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 -Insprpub/dist/include/nspr" + CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr" LDFLAGS="$LDFLAGS -L$prefix/lib -lnspr4" fi