/[libtool]/libtool/libtoolize.m4sh
ViewVC logotype

Diff of /libtool/libtoolize.m4sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.33 by gary, Sat Sep 10 15:38:27 2005 UTC revision 1.34 by gary, Tue Sep 27 13:09:20 2005 UTC
# Line 368  func_scan_files () Line 368  func_scan_files ()
368              s,^.*AC_CONFIG_AUX_DIR([[[  ]*\([^])]]*\).*$,auxdir=\1,; p;              s,^.*AC_CONFIG_AUX_DIR([[[  ]*\([^])]]*\).*$,auxdir=\1,; p;
369          };          };
370          /AC_CONFIG_MACRO_DIR(/ {          /AC_CONFIG_MACRO_DIR(/ {
371              s,^.*AC_CONFIG_MACRO_DIR([[[        ]*\([^])]]*\).*$,m4dir=\1,; p;              s,^.*AC_CONFIG_MACRO_DIR([[[        ]*\([^])]]*\).*$,macrodir=\1,; p;
372          };          };
373          /A[[CM]]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };          /A[[CM]]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
374          /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };          /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };
# Line 421  func_scan_files () Line 421  func_scan_files ()
421      my_sed_aclocal_flags='/^[[  ]]*ACLOCAL_[[A-Z_]]*FLAGS[[     ]]*=/ {      my_sed_aclocal_flags='/^[[  ]]*ACLOCAL_[[A-Z_]]*FLAGS[[     ]]*=/ {
422          s,^[[^=]]*=[[   ]]*\(.*\), \1,; q; };          s,^[[^=]]*=[[   ]]*\(.*\), \1,; q; };
423          d'          d'
424        m4dir="$macrodir"
425      if test ! -n "$m4dir" && test -f Makefile.am; then      if test ! -n "$m4dir" && test -f Makefile.am; then
426        my_m4dir_is_next=false        my_m4dir_is_next=false
427        for arg in `$SED "$my_sed_aclocal_flags" Makefile.am`; do        for arg in `$SED "$my_sed_aclocal_flags" Makefile.am`; do
# Line 629  func_serial_update () Line 630  func_serial_update ()
630      # Do this after the copy for hand maintained `aclocal.m4', incase      # Do this after the copy for hand maintained `aclocal.m4', incase
631      # it has `m4_include([DESTFILE])', so the copy effectively already      # it has `m4_include([DESTFILE])', so the copy effectively already
632      # updated `aclocal.m4'.      # updated `aclocal.m4'.
633      $use_aclocal || if test -f aclocal.m4; then      if test -f aclocal.m4; then
634        func_serial_max \        func_serial_max \
635            "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`            "$my_src_serial" `func_serial aclocal.m4 "$my_macro_regex"`
636        test "X$my_src_serial" = "X$func_serial_max_result" \        test "X$my_src_serial" = "X$func_serial_max_result" \
637            && func_echo "You should add the contents of \'$my_destfile' to \`aclocal.m4'."            && func_echo "You should add the contents of \`$my_destfile' to \`aclocal.m4'."
638      fi      fi
639    
640      return $my_return_status      return $my_return_status
# Line 948  func_nonemptydir_p () Line 949  func_nonemptydir_p ()
949      func_copy_some_files "$pkgmacro_files" "$aclocaldir" \      func_copy_some_files "$pkgmacro_files" "$aclocaldir" \
950        "$m4dir" func_serial_update        "$m4dir" func_serial_update
951    else    else
952      func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool macro files."        $opt_quiet || func_echo "You should add the contents of \`$aclocaldir/libtool.m4' to \`aclocal.m4'."
953    fi    fi
954    
955      # Suggest modern idioms for storing autoconf macros:
956      $opt_quiet || \
957        if test -z "$macrodir$ltdldir" && $seen_autoconf; then
958          if test x"$m4dir" = x.; then
959            func_echo "add \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac to store autoconf macros"
960          else
961            func_echo "consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to $configure.ac"
962          fi
963        fi
964    
965    # Offer some suggestions for avoiding duplicate files in a project    # Offer some suggestions for avoiding duplicate files in a project
966    # that uses libltdl:    # that uses libltdl:
967    if test -n "$ltdldir" && $seen_autoconf; then    if test -n "$ltdldir" && $seen_autoconf; then

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26