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

Diff of /libtool/libtoolize.m4sh

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

revision 1.24 by gary, Mon Apr 4 14:03:25 2005 UTC revision 1.25 by gary, Mon Apr 4 17:16:47 2005 UTC
# Line 80  seen_ltdl=false Line 80  seen_ltdl=false
80  libtoolize_flags=  libtoolize_flags=
81    
82  # Locations for important files:  # Locations for important files:
83  : ${pkgvdatadir="@pkgvdatadir@"}  : ${_lt_pkgvdatadir="@pkgvdatadir@"}
84  prefix=@prefix@  prefix=@prefix@
85  datadir=@datadir@  datadir=@datadir@
86  auxdir=  auxdir=
# Line 387  func_scan_files () Line 387  func_scan_files ()
387          || func_fatal_help "\`$configure_ac' does not exist"          || func_fatal_help "\`$configure_ac' does not exist"
388    
389      # check that existing directories from the list can be ls'ed      # check that existing directories from the list can be ls'ed
390      test -n "`{ cd $pkgvdatadir && ls; } 2>/dev/null`" \      test -n "`{ cd $_lt_pkgvdatadir && ls; } 2>/dev/null`" \
391          || func_fatal_error "can not list files in \`$pkgvdatadir'"          || func_fatal_error "can not list files in \`$_lt_pkgvdatadir'"
392    
393      # Set local variables to reflect contents of configure.ac      # Set local variables to reflect contents of configure.ac
394      my_uses_autoconf=false      my_uses_autoconf=false
# Line 870  func_massage_pkgvltdl_files () Line 870  func_massage_pkgvltdl_files ()
870    # Copy all the files from installed (or specified, if `-I' was used)    # Copy all the files from installed (or specified, if `-I' was used)
871    # libltdl to this project, if the user specified `--ltdl'.    # libltdl to this project, if the user specified `--ltdl'.
872    if test -n "$ltdldir"; then    if test -n "$ltdldir"; then
873      func_copy_some_files "$pkgvltdl_files" "$pkgvdatadir/libltdl" "$ltdldir"      func_copy_some_files "$pkgvltdl_files" "$_lt_pkgvdatadir/libltdl" "$ltdldir"
874    
875      # libtoolize the newly copied libltdl tree      # libtoolize the newly copied libltdl tree
876      ( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \      ( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \
# Line 883  func_massage_pkgvltdl_files () Line 883  func_massage_pkgvltdl_files ()
883      func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."      func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
884    fi    fi
885    if $opt_install; then    if $opt_install; then
886      func_config_update config.guess "$pkgvdatadir/config" "$auxdir"      func_config_update config.guess "$_lt_pkgvdatadir/config" "$auxdir"
887      func_config_update config.sub   "$pkgvdatadir/config" "$auxdir"      func_config_update config.sub   "$_lt_pkgvdatadir/config" "$auxdir"
888      func_install_update install-sh  "$pkgvdatadir/config" "$auxdir"      func_install_update install-sh  "$_lt_pkgvdatadir/config" "$auxdir"
889    fi    fi
890    func_ltmain_update ltmain.sh "$pkgvdatadir/config" "$auxdir"    func_ltmain_update ltmain.sh "$_lt_pkgvdatadir/config" "$auxdir"
891    
892    # Copy libtool's m4 macros to the macro directory, if they are newer.    # Copy libtool's m4 macros to the macro directory, if they are newer.
893    if test -n "$m4dir"; then    if test -n "$m4dir"; then
894      $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."      $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
895    
896      func_serial_update  libtool.m4 "$pkgvdatadir/m4" "$m4dir" \      func_serial_update  libtool.m4 "$_lt_pkgvdatadir/m4" "$m4dir" \
897        LT_INIT 'A[[CM]]_PROG_LIBTOOL'        LT_INIT 'A[[CM]]_PROG_LIBTOOL'
898    
899      if $seen_ltdl; then      if $seen_ltdl; then
900        func_serial_update ltdl.m4 "$pkgvdatadir/m4" "$m4dir" 'LTDL_INIT'        func_serial_update ltdl.m4 "$_lt_pkgvdatadir/m4" "$m4dir" 'LTDL_INIT'
901      else      else
902        func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used."        func_verbose "Not copying \`$m4dir/ltdl.m4', libltdl not used."
903      fi      fi
904    
905      func_copy_some_files "$pkgvmacro_files" "$pkgvdatadir/m4" \      func_copy_some_files "$pkgvmacro_files" "$_lt_pkgvdatadir/m4" \
906        "$m4dir" func_serial_update        "$m4dir" func_serial_update
907    else    else
908      func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool macro files."      func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool macro files."

Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25

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