diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-03-12 19:24:51 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2014-03-12 19:56:27 -0400 |
| commit | 33608985c02e8ff9651c917842010984ff65cf14 (patch) | |
| tree | e2ceab9dd28467d65608d483ac55d567dacd996e | |
| parent | fb0e5a9dbed732dd01d245f141ff2beb35689971 (diff) | |
| download | gnome-common-33608985c02e8ff9651c917842010984ff65cf14.tar.gz | |
gnome-common: use ACLOCAL_PATH over ACLOCAL_FLAGS
jhbuild has set this variable for more than two years.
https://bugzilla.gnome.org/show_bug.cgi?id=726208
| -rw-r--r-- | macros2/gnome-autogen.sh | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index c229ea0..1774661 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -151,14 +151,14 @@ print_m4macros_error() { printerr "***Error***: some autoconf macros required to build $PKG_NAME" printerr " were not found in your aclocal path, or some forbidden" printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" + printerr " ACLOCAL_PATH?" printerr } # Usage: # check_m4macros # Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. +# Uses REQUIRED_M4MACROS and ACLOCAL_PATH variables. check_m4macros() { # construct list of macro directories cm_macrodirs=`aclocal --print-ac-dir` @@ -177,15 +177,12 @@ check_m4macros() { fi fi - # Parse $ACLOCAL_FLAGS - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - add_to_cm_macrodirs "$2" - shift - fi - shift + # Parse $ACLOCAL_PATH + IFS="${IFS= }"; save_IFS="$IFS"; IFS=":" + for dir in ${ACLOCAL_PATH}; do + add_to_cm_macrodirs "$dir" done + IFS="$save_IFS" cm_status=0 if [ -n "$REQUIRED_M4MACROS" ]; then |