Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
d6bdbbab
Commit
d6bdbbab
authored
May 16, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mozilla and xpidl detection
parent
f02a46fd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
configure.ac
configure.ac
+8
-7
No files found.
configure.ac
View file @
d6bdbbab
...
@@ -5083,14 +5083,14 @@ then
...
@@ -5083,14 +5083,14 @@ then
if test "${MOZILLA_CONFIG}" = "no"
if test "${MOZILLA_CONFIG}" = "no"
then
then
AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
if test "${XULRUNNER_CONFIG}"
!
= "no"
if test "${XULRUNNER_CONFIG}" = "no"
then
then
AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
else
have_xul=true
have_xul=true
MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
else
AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
fi
fi
fi
if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
AC_CHECK_LIB(Xt,XtStrings,
AC_CHECK_LIB(Xt,XtStrings,
...
@@ -5124,6 +5124,7 @@ then
...
@@ -5124,6 +5124,7 @@ then
xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin"
fi
fi
fi
fi
dnl End of moz_sdk = ""
else
else
dnl special case for mingw32
dnl special case for mingw32
if test "${SYS}" = "mingw32"
if test "${SYS}" = "mingw32"
...
@@ -5165,11 +5166,11 @@ then
...
@@ -5165,11 +5166,11 @@ then
if test "${mozilla}" != "false"
if test "${mozilla}" != "false"
then
then
build_pic=yes
build_pic=yes
AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla)
AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla
:/usr/lib/xulrunner:/usr/lib64/xulrunner
)
if test "${XPIDL}" = "no"; then
if test "${XPIDL}" = "no"; then
AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.])
AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.])
fi
fi
fi
fi
fi
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment