Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
468e5ea3
Commit
468e5ea3
authored
Jan 05, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify MAKE detection and ./compile creation
Clarify what ./compile does
parent
9266718f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
12 deletions
+18
-12
configure.ac
configure.ac
+18
-12
No files found.
configure.ac
View file @
468e5ea3
...
@@ -4233,21 +4233,27 @@ dnl Generate makefiles
...
@@ -4233,21 +4233,27 @@ dnl Generate makefiles
AC_OUTPUT
AC_OUTPUT
dnl Do we have to use make or gmake ?
dnl Do we have to use make or gmake ?
USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac`
if make --version 2>&1|grep -q GNU
then
# GNU make, all seems good
MAKE=make
else
# Known GNU make alias (on BSD)
MAKE=gmake
fi
dnl Shortcut to nice compile message
dnl Shortcut to nice compile message
rm -f compile
if test -n $SHELL; then
if test -n $SHELL; then
SHELL=${CONFIG_SHELL-/bin/sh}
SHELL=${CONFIG_SHELL-/bin/sh}
fi
fi
echo '#! '$SHELL >
compile
rm -f
compile
echo
rm -f .error\$\$ >>compile
echo
"#! $SHELL
echo ERROR=0 >>compile
rm -f .error\$\$
echo export PATH=$PATH LANG=C >>compile
ERROR=0
e
cho "($USE_MAKE_OR_GMAKE V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile
e
xport PATH=\"$PATH\" LANG=C
echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile
($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl
echo test -f .error\$\$ \&\& ERROR=1 >>compile
test -f .error\$\$ \&\& ERROR=1
echo rm -f .error\$\$ >>compile
rm -f .error\$\$
e
cho exit \$ERROR >
>compile
e
xit \$ERROR"
>compile
chmod a+x compile
chmod a+x compile
echo "
echo "
...
@@ -4263,4 +4269,4 @@ else
...
@@ -4263,4 +4269,4 @@ else
echo "build vlc executable : no"
echo "build vlc executable : no"
fi
fi
echo "
echo "
To build vlc and its plugins, type \`
./compile' or \`$USE_MAKE_OR_GMAKE'
."
To build vlc and its plugins, type \`
$MAKE', or \`./compile' if you like nice colors
."
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