Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: add conditional autoreconf #398

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: add conditional autoreconf #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Project/GNU/CLI/AddThisToRoot_CLI_compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,11 @@ cd $Home
if test -e MediaInfo/Project/GNU/CLI/configure; then
cd MediaInfo/Project/GNU/CLI/
test -e Makefile && rm Makefile
chmod +x configure
./configure --enable-staticlibs $*

chmod +x autogen.sh
if [ "$OS" = "mac" ]; then
./configure $MacOptions --enable-staticlibs $*
./autogen.sh $MacOptions --enable-staticlibs $*
else
./configure --enable-staticlibs $*
./autogen.sh --enable-staticlibs $*
fi

if test -e Makefile; then
Expand Down
33 changes: 7 additions & 26 deletions Project/GNU/CLI/autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
#libtoolize
if test "$(uname)" = "Darwin" ; then
#Darwin based Systems like Mac OS X: libtoolize is called glibtoolize.
glibtoolize --automake
else
libtoolize --automake
if which autoreconf > /dev/null; then
rm -rf autom4te.cache
rm -f aclocal.m4 ltmain.sh
autoreconf -f -i -v --warnings=all || exit 1
fi

#aclocal
if test -e /usr/bin/aclocal-1.11 ; then
#OpenSolaris: no aclocal
aclocal-1.11
elif test -e /usr/bin/aclocal-1.10 ; then
aclocal-1.10
else
aclocal
fi

#automake
if test -e /usr/bin/automake-1.11 ; then
#OpenSolaris: no automake
automake-1.11 -a
elif test -e /usr/bin/automake-1.10 ; then
automake-1.10 -a
else
automake -a
chmod a+x configure
if [ -z "$NOCONFIGURE" ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am reluctant to have default behavior to launch ./configure, it is not the previous behavior and autogen.sh is planned for generating files for the final user, here we would have to change our build scripts in other places if we don't want to launch unnecessarily ./configure.

./configure "$@"
fi

autoreconf -fi