made autogen not to run the configure script automatically
This commit is contained in:
parent
4a2a4cc155
commit
1894479592
71 changed files with 808 additions and 309 deletions
|
@ -22,7 +22,7 @@
|
|||
#
|
||||
#
|
||||
# Author : $Author: maroy $
|
||||
# Version : $Revision: 1.5 $
|
||||
# Version : $Revision: 1.6 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/bin/autogen.sh,v $
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
|
@ -93,9 +93,3 @@ autoheader ${configure_ac}
|
|||
echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}"
|
||||
autoconf -I ${tmpdir} -o ${configure} ${configure_ac}
|
||||
|
||||
export CPPFLAGS="-I$usrdir/include"
|
||||
export LDFLAGS="-L$usrdir/lib"
|
||||
export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig"
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
|
||||
|
||||
${configure} "$@" && echo
|
||||
|
|
10
livesupport/modules/storage/configure
vendored
10
livesupport/modules/storage/configure
vendored
|
@ -22,7 +22,7 @@
|
|||
#
|
||||
#
|
||||
# Author : $Author: maroy $
|
||||
# Version : $Revision: 1.2 $
|
||||
# Version : $Revision: 1.3 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/configure,v $
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
|
@ -44,9 +44,9 @@ tmpdir=$basedir/tmp
|
|||
autogen=$bindir/autogen.sh
|
||||
configure=$tmpdir/configure
|
||||
|
||||
if [ -x $configure ]; then
|
||||
(cd $tmpdir && $configure "$@")
|
||||
else
|
||||
(cd $basedir && $autogen "$@")
|
||||
if [ ! -x $configure ]; then
|
||||
(cd $basedir && $autogen $*)
|
||||
fi
|
||||
|
||||
(cd $tmpdir && $configure $*)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue