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

Diff of /libtool/libtoolize.m4sh

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

revision 1.15 by gary, Tue Mar 15 11:49:59 2005 UTC revision 1.16 by gary, Thu Mar 24 11:38:25 2005 UTC
# Line 84  libtoolize_flags= Line 84  libtoolize_flags=
84  prefix=@prefix@  prefix=@prefix@
85  datadir=@datadir@  datadir=@datadir@
86  pkgvdatadirs=@pkgvdatadir@  pkgvdatadirs=@pkgvdatadir@
87    pkgvltdldirs=@pkgvdatadir@/libltdl
88  pkgvmacrodirs=@pkgvmacrodir@  pkgvmacrodirs=@pkgvmacrodir@
89  auxdir=  auxdir=
90  m4dir=  m4dir=
# Line 143  configure_ac=configure.in Line 144  configure_ac=configure.in
144    
145        -I)               test "$#" = 0 && func_missing_arg $opt && break        -I)               test "$#" = 0 && func_missing_arg $opt && break
146                          test -d "$1" \                          test -d "$1" \
147                            && pkgvdatadirs="`cd $1 && pwd`:$pkgvdatadirs"                            && pkgvdatadirs="`cd $1 && pwd`:$pkgvltdldirs"
148                            test -d "$1" \
149                              && pkgvltdldirs="`cd $1/libltdl \
150                                                  && pwd`:$pkgvltdldirs"
151                          test -d "$1/m4" \                          test -d "$1/m4" \
152                            && pkgvmacrodirs="`cd $1/m4 && pwd`:$pkgvmacrodirs"                            && pkgvmacrodirs="`cd $1/m4 && pwd`:$pkgvmacrodirs"
153                          func_quote_for_eval "$1"                          func_quote_for_eval "$1"
# Line 396  func_scan_files () Line 400  func_scan_files ()
400          || func_fatal_help "\`$configure_ac' does not exist"          || func_fatal_help "\`$configure_ac' does not exist"
401    
402      # TODO: check that existing directories from the list can be ls'ed      # TODO: check that existing directories from the list can be ls'ed
403      #test -n "`{ cd $pkgvdatadir && ls; } 2>dev/null`" \      #test -n "`{ cd $pkgvdatadirs && ls; } 2>dev/null`" \
404      #    || func_fatal_error "can not list files in \`$pkgvdatadir'"      #    || func_fatal_error "can not list files in \`$pkgvdatadirs'"
405    
406      # Set local variables to reflect contents of configure.ac      # Set local variables to reflect contents of configure.ac
407      my_uses_autoconf=false      my_uses_autoconf=false
# Line 834  func_massage_pkgvmacro_DATA () Line 838  func_massage_pkgvmacro_DATA ()
838      for my_filename in @pkgvmacro_DATA@; do      for my_filename in @pkgvmacro_DATA@; do
839        my_filename=`$ECHO "X$my_filename" | $Xsed -e "$basename"`        my_filename=`$ECHO "X$my_filename" | $Xsed -e "$basename"`
840    
841         # ignore excluded filenames        # ignore excluded filenames
842        if test -n "$my_glob_exclude"; then        if test -n "$my_glob_exclude"; then
843          eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'          eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
844        fi        fi
# Line 847  func_massage_pkgvmacro_DATA () Line 851  func_massage_pkgvmacro_DATA ()
851  }  }
852    
853    
854    # func_massage_pkgvltdl_files [glob_exclude]
855    # @pkgvltdl_files\@ is substituted as per its value in Makefile.am; this
856    # function massages it into a suitable format for func_copy_some_files.
857    func_massage_pkgvltdl_files ()
858    {
859        pkgvltdl_files=     # GLOBAL VAR
860    
861        my_glob_exclude="$1"
862    
863        # Massage a value for pkgvltdl_files from the value used in Makefile.am
864        for my_filename in @pkgvltdl_files@; do
865    
866          # ignore excluded filenames
867          if test -n "$my_glob_exclude"; then
868            eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
869          fi
870    
871          # ignore duplicates
872          case :$pkgvltdl_files: in
873            *:$my_filename:*) ;;
874            *) pkgvltdl_files="$pkgvltdl_files:$my_filename" ;;
875          esac
876        done
877    
878        # strip spurious leading `:'
879        pkgvltdl_files=`$ECHO "X$pkgvltdl_files" | $Xsed -e 's,^:*,,'`
880    }
881    
882    
883  ## ----------- ##  ## ----------- ##
884  ##    Main.    ##  ##    Main.    ##
885  ## ----------- ##  ## ----------- ##
# Line 854  func_massage_pkgvmacro_DATA () Line 887  func_massage_pkgvmacro_DATA ()
887  {  {
888    rerun_aclocal=false    rerun_aclocal=false
889    
890      func_massage_pkgvltdl_files
891    
892    # libtool.m4 and ltdl.m4 are handled specially below    # libtool.m4 and ltdl.m4 are handled specially below
893    func_massage_pkgvmacro_DATA 'libtool.m4|ltdl.m4'    func_massage_pkgvmacro_DATA 'libtool.m4|ltdl.m4'
894    
# Line 865  func_massage_pkgvmacro_DATA () Line 900  func_massage_pkgvmacro_DATA ()
900    # Copy all the files from installed (or specified, if `-I' was used)    # Copy all the files from installed (or specified, if `-I' was used)
901    # libltdl to this project, if the user specified `--ltdl'.    # libltdl to this project, if the user specified `--ltdl'.
902    if test -n "$ltdldir"; then    if test -n "$ltdldir"; then
903      func_copy_all_from_path -r libltdl "$pkgvdatadirs" "$ltdldir"      func_copy_some_files "$pkgvltdl_files" "$pkgvltdldirs" "$ltdldir"
904    
905      # libtoolize the newly copied libltdl tree      # libtoolize the newly copied libltdl tree
906      ( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \      ( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

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