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

Diff of /libtool/libtoolize.m4sh

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

revision 1.6 by rwild, Mon Dec 20 13:08:34 2004 UTC revision 1.7 by rwild, Tue Dec 28 13:31:10 2004 UTC
# Line 70  m4_include([getopt.m4sh]) Line 70  m4_include([getopt.m4sh])
70  opt_force=false  opt_force=false
71  opt_install=false  opt_install=false
72  opt_link=:  opt_link=:
73    opt_debug=:
74    
75  seen_libtool=false  seen_libtool=false
76  seen_ltdl=false  seen_ltdl=false
# Line 106  configure_ac=configure.in Line 107  configure_ac=configure.in
107                          ;;                          ;;
108    
109        --debug)          func_echo "enabling shell trace mode"        --debug)          func_echo "enabling shell trace mode"
110                          set -x                          opt_debug='set -x'
111                            $opt_debug
112                          ;;                          ;;
113    
114        --dry-run|-n)     if $opt_dry_run; then :; else        --dry-run|-n)     if $opt_dry_run; then :; else
# Line 185  configure_ac=configure.in Line 187  configure_ac=configure.in
187  # then try to copy SRCFILE to DESTFILE.  # then try to copy SRCFILE to DESTFILE.
188  func_copy ()  func_copy ()
189  {  {
190        $opt_debug
191      my_srcfile="$1"      my_srcfile="$1"
192      my_destfile="$2"      my_destfile="$2"
193      my_return_status=1      my_return_status=1
# Line 212  func_copy () Line 215  func_copy ()
215  # used by func_copy_all_files callbacks.  # used by func_copy_all_files callbacks.
216  func_copy_cb ()  func_copy_cb ()
217  {  {
218        $opt_debug
219      func_copy "$2/$1" "$3/$1"      func_copy "$2/$1" "$3/$1"
220  }  }
221    
# Line 222  func_copy_cb () Line 226  func_copy_cb ()
226  # to DESTDIR.  # to DESTDIR.
227  func_copy_all_from_path ()  func_copy_all_from_path ()
228  {  {
229        $opt_debug
230      if test "X$1" = X-r; then      if test "X$1" = X-r; then
231        my_args=-r        my_args=-r
232        shift        shift
# Line 255  func_copy_all_from_path () Line 260  func_copy_all_from_path ()
260  # checks to decide whether to overwrite the dest file.  # checks to decide whether to overwrite the dest file.
261  func_copy_all_files ()  func_copy_all_files ()
262  {  {
263        $opt_debug
264      my_opt_recurse=false      my_opt_recurse=false
265      if test "X$1" = X-r; then      if test "X$1" = X-r; then
266        my_opt_recurse=:        my_opt_recurse=:
# Line 308  func_copy_all_files () Line 314  func_copy_all_files ()
314  # convention is needed to allow spaces in file and directory names.  # convention is needed to allow spaces in file and directory names.
315  func_copy_some_files ()  func_copy_some_files ()
316  {  {
317        $opt_debug
318      my_srcfile_spec="$1"      my_srcfile_spec="$1"
319      my_srcdirs="$2"      my_srcdirs="$2"
320      my_destdir="$3"      my_destdir="$3"
# Line 346  func_copy_some_files () Line 353  func_copy_some_files ()
353  # configure.(ac|in) and aclocal.m4.  # configure.(ac|in) and aclocal.m4.
354  func_scan_files ()  func_scan_files ()
355  {  {
356        $opt_debug
357      # Prefer configure.ac to configure.in      # Prefer configure.ac to configure.in
358      test -f configure.ac && configure_ac=configure.ac      test -f configure.ac && configure_ac=configure.ac
359      test -f "$configure_ac" \      test -f "$configure_ac" \
# Line 449  func_scan_files () Line 457  func_scan_files ()
457  # Output INCLUDEFILE if SEARCHFILE m4_includes it, else output SEARCHFILE.  # Output INCLUDEFILE if SEARCHFILE m4_includes it, else output SEARCHFILE.
458  func_included_files ()  func_included_files ()
459  {  {
460        $opt_debug
461      my_searchfile="$1"      my_searchfile="$1"
462    
463      my_include_regex=      my_include_regex=
# Line 471  func_included_files () Line 480  func_included_files ()
480  # func_filename_path_search filename dirs  # func_filename_path_search filename dirs
481  func_filename_path_search ()  func_filename_path_search ()
482  {  {
483        $opt_debug
484      func_filename_path_search_result=      func_filename_path_search_result=
485    
486      my_save_IFS="$IFS"; IFS=:      my_save_IFS="$IFS"; IFS=:
# Line 489  func_filename_path_search () Line 499  func_filename_path_search ()
499  # comment line must also match MACRO_REGEX, if given.  # comment line must also match MACRO_REGEX, if given.
500  func_serial ()  func_serial ()
501  {  {
502        $opt_debug
503      my_filename="$1"      my_filename="$1"
504      my_macro_regex="$2"      my_macro_regex="$2"
505      my_sed_serial='/^# serial [1-9][0-9]*[      ]*'"$my_macro_regex"'[  ]*$/ {      my_sed_serial='/^# serial [1-9][0-9]*[      ]*'"$my_macro_regex"'[  ]*$/ {
# Line 521  func_serial () Line 532  func_serial ()
532  # OLD_MACRO_REGEX must match any text after "# serial N" in both files.  # OLD_MACRO_REGEX must match any text after "# serial N" in both files.
533  func_serial_update ()  func_serial_update ()
534  {  {
535        $opt_debug
536      my_filename="$1"      my_filename="$1"
537      my_srcdirs="$2"      my_srcdirs="$2"
538      my_destdir="$3"      my_destdir="$3"
# Line 588  func_serial_update () Line 600  func_serial_update ()
600  # Sanity check macros from aclocal.m4 against installed versions.  # Sanity check macros from aclocal.m4 against installed versions.
601  func_check_macros ()  func_check_macros ()
602  {  {
603        $opt_debug
604      # Don't trace for this, we're just checking the user didn't invoke it      # Don't trace for this, we're just checking the user didn't invoke it
605      # directly from configure.ac.      # directly from configure.ac.
606      $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB \      $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB \
# Line 606  func_check_macros () Line 619  func_check_macros ()
619  # specified `--force' at the command line.  # specified `--force' at the command line.
620  func_ltmain_update ()  func_ltmain_update ()
621  {  {
622        $opt_debug
623      my_filename="$1"      my_filename="$1"
624      my_srcdirs="$2"      my_srcdirs="$2"
625      my_destdir="$3"      my_destdir="$3"
# Line 641  func_ltmain_update () Line 655  func_ltmain_update ()
655  # specified `--force' at the command line.  # specified `--force' at the command line.
656  func_config_update ()  func_config_update ()
657  {  {
658        $opt_debug
659      my_filename="$1"      my_filename="$1"
660      my_srcdirs="$2"      my_srcdirs="$2"
661      my_destdir="$3"      my_destdir="$3"

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

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