Changeset 274 for trunk/zoo-kernel/configure.ac
- Timestamp:
- Jul 18, 2011, 1:46:56 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-kernel/configure.ac
r208 r274 314 314 JS_FILE="" 315 315 else 316 JS_FILE="service_internal_js.o" 316 317 if test "$JSHOME" = "yes" 317 318 then 318 JS_FILE="service_internal_js.o"319 319 320 320 #on teste si on est sous debian like 321 321 if test -f "/usr/bin/dpkg" 322 322 then 323 if test -n "`dpkg -l | grep libmozjs -dev`"323 if test -n "`dpkg -l | grep libmozjs185-dev`" 324 324 then 325 JS_CPPFLAGS="-I/usr/include/ mozjs/"326 JS_LDFLAGS="-L/usr/lib -lmozjs -lm"327 JS_LIB="mozjs "325 JS_CPPFLAGS="-I/usr/include/js/" 326 JS_LDFLAGS="-L/usr/lib -lmozjs185 -lm" 327 JS_LIB="mozjs185" 328 328 else 329 XUL_VERSION="`dpkg -l | grep xulrunner | grep dev | awk '{print $3;}' | sed -e 's/\([[0-9]]\{1,2\}\.[[0-9]]\{1,2\}\.[[0-9]]\{1,2\}\.[[0-9]]\{1,2\}\).*/\1/'`"329 XUL_VERSION="`dpkg -l | grep xulrunner | grep dev | awk '{print $3;}' | cut -d'+' -f1`" 330 330 if test -n "$XUL_VERSION" 331 331 then … … 334 334 JS_LIB="mozjs" 335 335 else 336 AC_MSG_ERROR([You must install libmozjs -dev or xulrunner-dev ])336 AC_MSG_ERROR([You must install libmozjs185-dev or xulrunner-dev ]) 337 337 fi 338 338 fi 339 339 else 340 AC_MSG_ERROR([You must specify your custom install of lib js])340 AC_MSG_ERROR([You must specify your custom install of libmozjs185]) 341 341 fi 342 342 else 343 JS_CPPFLAGS="-I$JSHOME/include/ "344 JS_LDFLAGS="-L$JSHOME/lib -lmozjs -lm"345 JS_LIB="mozjs "343 JS_CPPFLAGS="-I$JSHOME/include/js/" 344 JS_LDFLAGS="-L$JSHOME/lib -lmozjs185 -lm" 345 JS_LIB="mozjs185" 346 346 347 347 fi … … 356 356 LIBS="$JS_LDFLAGS" 357 357 358 AC_CHECK_LIB([$JS_LIB], [JS_ CallFunctionName], [], [AC_MSG_ERROR([could not find $JS_LIB])], [])358 AC_CHECK_LIB([$JS_LIB], [JS_NewCompartmentAndGlobalObject,JS_CompileFile,JS_CallFunctionName], [], [AC_MSG_ERROR([could not find $JS_LIB])], []) 359 359 360 360 AC_SUBST([JS_CPPFLAGS]) … … 366 366 367 367 AC_CONFIG_FILES([Makefile]) 368 AC_CONFIG_FILES([ZOOMakefile.opts]) 368 369 AC_OUTPUT
Note: See TracChangeset
for help on using the changeset viewer.