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

Diff of /libtool/libtoolize.m4sh

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

revision 1.40 by gary, Wed Oct 26 10:36:31 2005 UTC revision 1.41 by gary, Wed Oct 26 10:42:03 2005 UTC
# Line 40  m4_divert_push([SCRIPT])#! /bin/sh Line 40  m4_divert_push([SCRIPT])#! /bin/sh
40  # -f, --force           replace existing files  # -f, --force           replace existing files
41  # -i, --install         copy missing auxiliary files  # -i, --install         copy missing auxiliary files
42  #     --ltdl[=DIR]      install libltdl sources [default: libltdl]  #     --ltdl[=DIR]      install libltdl sources [default: libltdl]
43    #     --nonrecursive    prepare ltdl for non-recursive make
44  # -q, --quiet           work silently  # -q, --quiet           work silently
45    #     --recursive       prepare ltdl for recursive make
46    #     --subproject      prepare ltdl to configure and build independently
47  # -v, --verbose         verbosely report processing  # -v, --verbose         verbosely report processing
48  #     --version         print version information and exit  #     --version         print version information and exit
49  # -h, --help            print short or long help message  # -h, --help            print short or long help message
# Line 78  seen_autoconf=false Line 81  seen_autoconf=false
81  seen_libtool=false  seen_libtool=false
82  seen_ltdl=false  seen_ltdl=false
83    
84    # ltdl can be installed to be self-contained (subproject, the default);
85    # or to be configured by a parent project, either with a recursive or
86    # nonrecursive automake driven make:
87    ltdl_mode=
88    
89  # Locations for important files:  # Locations for important files:
90  prefix=@prefix@  prefix=@prefix@
91  datadir=@datadir@  datadir=@datadir@
# Line 135  configure_ac=configure.in Line 143  configure_ac=configure.in
143                          fi                          fi
144                          ;;                          ;;
145    
146          --nonrecursive|--non-recursive)
147                            ltdl_mode=nonrecursive
148                            ;;
149    
150        --quiet|--automake|-q) # --automake is for 1.5 compatibility        --quiet|--automake|-q) # --automake is for 1.5 compatibility
151                          opt_quiet=:                          opt_quiet=:
152                          ;;                          ;;
153    
154          --recursive)      ltdl_mode=recursive ;;
155    
156          --subproject)     ltdl_mode=subproject ;;
157    
158        --verbose|-v)     opt_verbose=: ;;        --verbose|-v)     opt_verbose=: ;;
159    
160        # Separate optargs to long options:        # Separate optargs to long options:
# Line 386  func_scan_files () Line 402  func_scan_files ()
402          };          };
403          /_LT_CONFIG_LTDL_DIR(/d;          /_LT_CONFIG_LTDL_DIR(/d;
404          /LT_CONFIG_LTDL_DIR(/ {          /LT_CONFIG_LTDL_DIR(/ {
405              s,^.*LT_CONFIG_LTDL_DIR([[[  ]*\([^])]]*\).*$,ac_ltdldir=\1,; p;              s/^.*LT_CONFIG_LTDL_DIR([[[  ]*\([^]),]*\)[^,]]*/ac_ltdldir=\1%%/;
406                s/%%[[[,    ]*\([^])]]*\).*$/ ac_ltdl_mode=\1%%/;
407                s/%%.*$//; p;
408          };          };
409          /A[[CM]]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };          /A[[CM]]_PROG_LIBTOOL/ { s,^.*$,seen_libtool=:,; p; };
410          /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };          /LT_INIT/            { s,^.*$,seen_libtool=:,; p; };
# Line 404  func_scan_files () Line 422  func_scan_files ()
422    
423      ac_ltdldir=`$ECHO "X$ac_ltdldir" | $Xsed -e 's,/*$,,'`      ac_ltdldir=`$ECHO "X$ac_ltdldir" | $Xsed -e 's,/*$,,'`
424    
425      # If $configure_ac contains AC_CONFIG_AUX_DIR, check that it was      # If $configure_ac contains AC_CONFIG_LTDL_DIR, check that its
426      # not given in terms of a shell variable!      # arguments were not given in terms of a shell variable!
427      case "$ac_ltdldir" in      case "$ac_ltdldir$ac_ltdl_mode" in
428        *\$*)        *\$*)
429          func_fatal_error "can not handle variables in LT_CONFIG_LTDL_DIR"          func_fatal_error "can not handle variables in LT_CONFIG_LTDL_DIR"
430          ;;          ;;
# Line 427  func_scan_files () Line 445  func_scan_files ()
445      esac      esac
446    
447    
448        # ------------------- #
449        # Validate ltdl_mode. #
450        # ------------------- #
451    
452        test -n "$ac_ltdl_mode" && seen_ltdl=:
453    
454        # If neither --ltdl nor LT_CONFIG_LTDL_DIR are specified, default to
455        # `subproject'.  If both are specified, they must be the same.  Otherwise,
456        # take the one that is given!
457        case x$ac_ltdl_mode,x$ltdl_mode in
458          x,x)      ltdl_mode=subproject    ;;
459          x*,x)     ltdl_mode=$ac_ltdl_mode ;;
460          x,x*)     ltdl_mode=$ltdl_mode    ;;
461          *)
462            test x"$ac_ltdl_mode" = x"$ltdl_mode" || \
463                func_fatal_error "--$ltdl_mode does not match LT_CONFIG_LTDL_DIR($ac_ltdldir, $ac_ltdl_mode)"
464            ;;
465        esac
466    
467    
468      # ---------------- #      # ---------------- #
469      # Validate auxdir. #      # Validate auxdir. #
470      # ---------------- #      # ---------------- #
# Line 987  func_nonemptydir_p () Line 1025  func_nonemptydir_p ()
1025    func_nonemptydir_p pkgdatadir    func_nonemptydir_p pkgdatadir
1026    func_nonemptydir_p aclocaldir    func_nonemptydir_p aclocaldir
1027    
1028    func_massage_pkgltdl_files    func_scan_files
1029    
1030      # These files are handled specially, depending on ltdl_mode:
1031      case $ltdl_mode in
1032        *recursive)
1033          glob_exclude_pkgltdl_files='Makefile.am|Makefile.in*|aclocal.m4|config*'
1034          ;;
1035        *)
1036          glob_exclude_pkgltdl_files='Makefile.inc'
1037          ;;
1038      esac
1039    
1040      func_massage_pkgltdl_files "$glob_exclude_pkgltdl_files"
1041    func_massage_pkgconfig_files    func_massage_pkgconfig_files
1042    
1043    # libtool.m4 and ltdl.m4 are handled specially below    # libtool.m4 and ltdl.m4 are handled specially below
# Line 995  func_nonemptydir_p () Line 1045  func_nonemptydir_p ()
1045    
1046    glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'    glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
1047    
   func_scan_files  
   
1048    # Copy all the files from installed libltdl to this project, if the    # Copy all the files from installed libltdl to this project, if the
1049    # user specified `--ltdl'.    # user specified `--ltdl'.
1050    if $opt_ltdl; then    if $opt_ltdl; then
1051    
1052        # For recursive ltdl modes, copy a suitable Makefile.{am,inc}:
1053        case $ltdl_mode in
1054          recursive)    pkgltdl_files="Makefile.am:$pkgltdl_files"  ;;
1055          nonrecursive) pkgltdl_files="Makefile.inc:$pkgltdl_files" ;;
1056        esac
1057    
1058      func_copy_some_files "$pkgltdl_files" "$pkgltdldir/libltdl" "$ltdldir"      func_copy_some_files "$pkgltdl_files" "$pkgltdldir/libltdl" "$ltdldir"
1059    
1060      # Unless we share CONFIG_MACRO_DIR with our parent project,      # Unless we share CONFIG_MACRO_DIR with our parent project,

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41

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