Menu
▾
▴
CVS: bzflag autogen.sh,2.12.2.3,2.12.2.4
|
From: Sean M. <br...@us...> - 2007-02-26 05:15:09
|
Update of /cvsroot/bzflag/bzflag In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31258 Modified Files: Tag: v2_0branch autogen.sh Log Message: merge from head, updates supporting recursive configures and optional autotools Index: autogen.sh =================================================================== RCS file: /cvsroot/bzflag/bzflag/autogen.sh,v retrieving revision 2.12.2.3 retrieving revision 2.12.2.4 diff -w -u -r2.12.2.3 -r2.12.2.4 --- autogen.sh 22 Feb 2007 20:20:46 -0000 2.12.2.3 +++ autogen.sh 26 Feb 2007 05:15:08 -0000 2.12.2.4 @@ -201,6 +201,27 @@ } +###################################### +# LOCATE_CONFIGURE_TEMPLATE FUNCTION # +###################################### +locate_configure_template ( ) { + _pwd="`pwd`" + if test -f "./configure.ac" ; then + echo "./configure.ac" + elif test -f "./configure.in" ; then + echo "./configure.in" + elif test -f "$_pwd/configure.ac" ; then + echo "$_pwd/configure.ac" + elif test -f "$_pwd/configure.in" ; then + echo "$_pwd/configure.in" + elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then + echo "$PATH_TO_AUTOGEN/configure.ac" + elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then + echo "$PATH_TO_AUTOGEN/configure.in" + fi +} + + ################## # argument check # ################## @@ -351,12 +372,8 @@ # look for a configure file # ############################# if [ "x$CONFIGURE" = "x" ] ; then - CONFIGURE=/dev/null - if test -f configure.ac ; then - CONFIGURE=configure.ac - elif test -f configure.in ; then - CONFIGURE=configure.in - fi + CONFIGURE="`locate_configure_template`" + $VERBOSE_ECHO "Found a configure template: $CONFIGURE" else $ECHO "Using CONFIGURE environment variable override: $CONFIGURE" fi @@ -630,6 +647,27 @@ ####################### initialize ( ) { + ################################## + # check for a configure template # + ################################## + CONFIGURE="`locate_configure_template`" + config_fail=no + if [ "x$CONFIGURE" = "x" ] ; then + config_fail=yes + elif ! test -f $CONFIGURE ; then + config_fail=yes + fi + if [ "x$config_fail" = "xyes" ] ; then + $ECHO + $ECHO "A configure.ac or configure.in file could not be located implying" + $ECHO "that the GNU Build System is at least not used in this directory. In" + $ECHO "any case, there is nothing to do here without one of those files." + $ECHO + $ECHO "ERROR: No configure.in or configure.ac file found." + exit 1 + fi + + ##################### # detect an aux dir # ##################### @@ -644,8 +682,8 @@ ################################ # detect a recursive configure # ################################ - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" CONFIG_SUBDIRS="" + _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" for dir in $_det_config_subdirs ; do if test -d "$dir" ; then $VERBOSE_ECHO "Detected recursive configure directory: $dir" @@ -757,6 +795,25 @@ $VERBOSE_ECHO "$autoreconf_output" if [ ! $ret = 0 ] ; then + if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then + if [ ! "x`echo \"$autoreconf_output\" | grep \"failed to run libtoolize: No such file or directory\"`" = "x" ] ; then + $ECHO + $ECHO "Warning: autoreconf failed but for for a reason that seems to be" + $ECHO "a common libtool misconfiguration issue. This problem is commonly" + $ECHO "found on systems that have installed libtoolize under a different" + $ECHO "name without providing a symbolic link or a LIBTOOLIZE environment" + $ECHO "variable." + $ECHO + $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE" + export LIBTOOLIZE + RUN_RECURSIVE=no + export RUN_RECURSIVE + $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + exit $? + fi + fi + $ECHO "Warning: $AUTORECONF failed" if test -f ltmain.sh ; then @@ -820,19 +877,6 @@ # autoheader # # automake -a -c -f # ################################################## - $ECHO - $ECHO $ECHO_N "Preparing build ... $ECHO_C" - - if ! test -f configure.in -o -f configure.ac ; then - $ECHO - $ECHO - $ECHO "A configure.ac or configure.in file could not be located implying" - $ECHO "that the GNU Build System is at least not used in this directory. In" - $ECHO "any case, there is nothing to do here without one of those files." - $ECHO - $ECHO "ERROR: No configure.in or configure.ac file found." - exit 1 - fi ########### # aclocal # @@ -846,6 +890,16 @@ ############## # libtoolize # ############## + need_libtoolize=no + for feature in AC_PROG_LIBTOOL LT_INIT ; do + $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" + found="`grep \"^$feature.*\" $CONFIGURE`" + if [ ! "x$found" = "x" ] ; then + need_libtoolize=yes + break + fi + done + if [ "x$need_libtoolize" = "x" ] ; then if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS" libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`" @@ -886,7 +940,9 @@ cp ltmain.sh "${_aux_dir}/ltmain.sh" $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C" fi - fi + fi # ltmain.sh + fi # need_libtoolize + ############ # autoconf # @@ -932,7 +988,7 @@ $ECHO $ECHO "Warning: Unsupported macros were found in $CONFIGURE" $ECHO - $ECHO "The $CONFIGURE file was scanned in order to determine if any" + $ECHO "The `echo $CONFIGURE | basename` file was scanned in order to determine if any" $ECHO "unsupported macros are used that exceed the minimum version" $ECHO "settings specified within this file. As such, the following macros" $ECHO "should be removed from configure.ac or the version numbers in this" @@ -976,25 +1032,46 @@ $ECHO " $AUTOGEN_SH --verbose" else $ECHO "reviewing the minimum GNU Autotools version settings contained in" - $ECHO "this script along with the macros being used in your $CONFIGURE file." + $ECHO "this script along with the macros being used in your `echo $CONFIGURE | basename` file." fi $ECHO $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C" - fi - fi + fi # autoconf ret = 0 + fi # autoconf ret = 0 ############## # autoheader # ############## + need_autoheader=no + for feature in AM_CONFIG_HEADER AC_CONFIG_HEADER ; do + $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" + found="`grep \"^$feature.*\" $CONFIGURE`" + if [ ! "x$found" = "x" ] ; then + need_autoheader=yes + break + fi + done + if [ "x$need_autoheader" = "x" ] ; then $VERBOSE_ECHO "$AUTOHEADER $AUTOHEADER_OPTIONS" autoheader_output="`$AUTOHEADER $AUTOHEADER_OPTIONS 2>&1`" ret=$? $VERBOSE_ECHO "$autoheader_output" if [ ! $ret = 0 ] ; then $ECHO "ERROR: $AUTOHEADER failed" && exit 2 ; fi + fi # need_autoheader ############ # automake # ############ + need_automake=no + for feature in AM_INIT_AUTOMAKE ; do + $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" + found="`grep \"^$feature.*\" $CONFIGURE`" + if [ ! "x$found" = "x" ] ; then + config_header=yes + break + fi + done + if [ "x$need_automake" = "x" ] ; then $VERBOSE_ECHO "$AUTOMAKE $AUTOMAKE_OPTIONS" automake_output="`$AUTOMAKE $AUTOMAKE_OPTIONS 2>&1`" ret=$? @@ -1023,48 +1100,15 @@ fi $ECHO "ERROR: $AUTOMAKE failed" exit 2 - fi + fi # automake ret = 0 + fi # need_automake } -################################## -# run manual preparation steps # -################################## -if [ "x$reconfigure_manually" = "xyes" ] ; then - - # XXX if this is a recursive configure, manual steps don't work - # yet .. assume it's the libtool/glibtool problem. - if [ ! "x$CONFIG_SUBDIRS" = "x" ] ; then - $ECHO "Running the preparation steps individually does not yet work" - $ECHO "well with a recursive configure." - if [ ! "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then - exit 3 - fi - $ECHO "Assuming this is a libtoolize problem..." - export LIBTOOLIZE - RUN_RECURSIVE=no - export RUN_RECURSIVE - $ECHO - $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE" - $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - exit $? - fi - +recursive_manual_autogen ( ) { # run the build preparation steps manually for this directory manual_autogen - # for projects using recursive configure, run the build - # preparation steps for the subdirectories. - for dir in $CONFIG_SUBDIRS ; do - $VERBOSE_ECHO "Processing recursive configure in $dir" - cd "$_prev_path" - cd "$dir" - manual_autogen - done -fi - - ######################################### # restore COPYING & INSTALL from backup # ######################################### @@ -1079,6 +1123,7 @@ # restore the backup $VERBOSE_ECHO "Restoring COPYING from backup (automake -f likely clobbered it)" $VERBOSE_ECHO "echo \"\$COPYING_BACKUP\" > COPYING" + rm -f COPYING echo "$COPYING_BACKUP" > COPYING # release content COPYING_BACKUP="" @@ -1095,6 +1140,7 @@ # restore the backup $VERBOSE_ECHO "Restoring INSTALL from backup (automake -f likely clobbered it)" $VERBOSE_ECHO "echo \"\$INSTALL_BACKUP\" > INSTALL" + rm -f INSTALL echo "$INSTALL_BACKUP" > INSTALL # release content INSTALL_BACKUP="" @@ -1102,16 +1148,59 @@ fi fi + # for projects using recursive configure, run the build + # preparation steps for the subdirectories. + if [ ! "x$CONFIG_SUBDIRS" = "x" ] ; then + $VERBOSE_ECHO "Recursively configuring the following directories:" + $VERBOSE_ECHO " $CONFIG_SUBDIRS" + for dir in $CONFIG_SUBDIRS ; do + $VERBOSE_ECHO "Processing recursive configure in $dir" + cd "$_prev_path" + cd "$dir" + initialize + recursive_manual_autogen + done + fi +} + + +################################ +# run manual preparation steps # +################################ +if [ "x$reconfigure_manually" = "xyes" ] ; then + $ECHO + $ECHO $ECHO_N "Preparing build ... $ECHO_C" + + recursive_manual_autogen +fi + ######################### # restore and summarize # ######################### cd "$_prev_path" +config_ac="`locate_configure_template`" +config="`echo $config_ac | sed 's/\.ac$//' | sed 's/\.in$//'`" +if [ "x$config" = "x" ] ; then + $VERBOSE_ECHO "WARNING: path to configure could not be found" +fi +if [ ! -f "$config" ] ; then + $VERBOSE_ECHO "WARNING: expected configure file does not exist" + config="" +fi $ECHO "done" $ECHO +if [ "x$config" = "x" ] ; then + $ECHO "WARNING: The $PROJECT build system should now be prepared but there" + $ECHO "does not seem to be a resulting configure file. This is unexpected" + $ECHO "and likely the result of an error. You should run $NAME_OF_AUTOGEN" + $ECHO "with the --verbose option to get more details on a potential" + $ECHO "misconfiguration." +else $ECHO "The $PROJECT build system is now prepared. To build here, run:" -$ECHO " $PATH_TO_AUTOGEN/configure" + $ECHO " $config" $ECHO " make" +fi # Local Variables: |
