[gnome-shell] Remove DYNAMIC_MOZJS_HACK bits
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Remove DYNAMIC_MOZJS_HACK bits
- Date: Fri, 11 Mar 2011 15:30:49 +0000 (UTC)
commit 74314bacd78078ca5b1ce736f6db02a666cfca49
Author: Colin Walters <walters verbum org>
Date: Fri Mar 11 10:29:27 2011 -0500
Remove DYNAMIC_MOZJS_HACK bits
Not used anymore now that gnome-shell is a real ELF binary with an
rpath.
configure.ac | 14 --------------
src/Makefile.am | 1 -
2 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ebd5851..32bcc01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,20 +190,6 @@ AC_ARG_ENABLE(jhbuild-wrapper-script,
AS_HELP_STRING([--jhbuild-wrapper-script=yes],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)
AM_CONDITIONAL(USE_JHBUILD_WRAPPER_SCRIPT, test "x$enable_jhbuild_wrapper_script" = xyes)
-AC_MSG_CHECKING([for Ubuntu])
-if test -f /etc/ubuntu_version; then
- enable_dynamic_mozjs_hack_default=yes
- AC_MSG_RESULT([yes])
-else
- enable_dynamic_mozjs_hack_default=no
- AC_MSG_RESULT([no])
-fi
-
-AC_ARG_ENABLE(dynamic-mozjs-hack,
- AS_HELP_STRING([--dynamic-mozjs-hack=no],[Look for libmozjs.so using pkg-config]),,enable_dynamic_mozjs_hack=$enable_dynamic_mozjs_hack_default)
-ENABLE_DYNAMIC_MOZJS_HACK=$enable_dynamic_mozjs_hack
-AC_SUBST(ENABLE_DYNAMIC_MOZJS_HACK)
-
AC_CONFIG_FILES([
Makefile
data/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c3e1b6..eb346e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,6 @@ generated_script_substitutions = \
-e "s|@libexecdir[ ]|$(libexecdir)|" \
-e "s|@libdir[ ]|$(libdir)|" \
-e "s|@pkgdatadir[ ]|$(pkgdatadir)|" \
- -e "s|@ENABLE_DYNAMIC_MOZJS_HACK[ ]|$(ENABLE_DYNAMIC_MOZJS_HACK)|" \
-e "s|@PYTHON[ ]|$(PYTHON)|" \
-e "s|@VERSION[ ]|$(VERSION)|" \
-e "s|@sysconfdir[ ]|$(sysconfdir)|"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]