Navigation

Changeset d636cba575eb5b9fc31bd96aaa04891c7e342101

Timestamp:

05/10/06 00:41:16 (2 years ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1147214476 +0000

git-parent:

[dea973301c3c0854ba370b6e0f6a5a113026f214]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1147214476 +0000

Message:

configure.ac: Detect the Xulrunner sdk (from sam's debian patch)

Files:

r645e867	rd636cba
5083	5083	if test "${MOZILLA_CONFIG}" = "no"
5084	5084	then
5085		AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
5086		else
	5085	AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
	5086	if test "${XULRUNNER_CONFIG}" != "no"
	5087	then
	5088	have_xul=true
	5089	MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
	5090	else
	5091	AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
	5092	fi
	5093	fi
5087	5094	if ${MOZILLA_CONFIG} --defines \| grep -q 'MOZ_X11=1'; then
5088	5095	LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
…	…
5111	5118	XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \
5112	5119	`${MOZILLA_CONFIG} --idlflags plugin xpcom java` "
5113		xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
	5120	if ${have_xul}
	5121	then
	5122	xpidl_path="`${MOZILLA_CONFIG} --prefix`/lib/xulrunner"
	5123	else
	5124	xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
	5125	fi
5114	5126	fi
5115	5127	else
…	…
5119	5131	AC_CHECK_TOOL(CYGPATH, cygpath, "")
5120	5132	dnl latest gecko sdk does not have an xpcom directory
5121		if test -d "${with_mozilla_sdk_path}/xpcom"; then
	5133	if test -d "${with_mozilla_sdk_pat.}/xpcom"; then
5122	5134	mozilla_sdk_xpcom="/xpcom"
5123	5135	fi
…	…
5158	5170	AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.])
5159	5171	fi
5160		fi
	5172
5161	5173	fi
5162	5174	AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})