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

Diff of /libtool/libtoolize.m4sh

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

revision 1.38 by gary, Wed Oct 26 10:31:51 2005 UTC revision 1.39 by gary, Wed Oct 26 10:34:08 2005 UTC
# Line 794  func_install_update () Line 794  func_install_update ()
794  func_check_macros ()  func_check_macros ()
795  {  {
796      $opt_debug      $opt_debug
797        ac_config_macro_dir_advised=false
798    
799      $seen_autoconf \      $seen_autoconf || return
       || return  
800    
801      # Don't trace for this, we're just checking the user didn't invoke it      # Suggest modern idioms for storing autoconf macros:
802      # directly from configure.ac.      if test -z "$macrodir$ltdldir"; then
803      $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB \        if test x"$m4dir" = x.; then
804        && func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"          func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and rerunning"
805            func_echo " libtoolize, to keep the correct libtool macros in-tree."
806          else
807            func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to $configure.ac,"
808            func_echo "and rerunning libtoolize."
809          fi
810        elif test -z "$m4dir"; then
811          if test "$ltdldir/m4" != "$m4dir"; then
812            acmacrodir="$ltdldir/m4"
813          else
814            acmacrodir="$aclocaldir"
815          fi
816    
817          func_echo "You should add the contents of the following files to \`aclocal.m4':"
818          for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4; do
819            func_echo "  \`$acmacrodir/$need'"
820          done
821          if $seen_ltdl || $opt_ltdl; then
822            for need in argz.m4 ltdl.m4; do
823              func_echo "  \`$acmacrodir/$need'"
824            done
825          fi
826          if test "$acmacrodir" != "$aclocaldir"; then
827            func_echo "or else add \`AC_CONFIG_MACRO_DIR([[$acmacrodir]])' to $configure_ac."
828            ac_config_macro_dir_advised=:
829          fi
830        fi
831    
832        $seen_libtool ||
833          func_echo "Remember to add \`LT_INIT' to $configure_ac."
834    
835        if $opt_ltdl; then
836    
837      $seen_libtool \        # Suggest using LT_WITH_LTDL if appropriate:
838        || func_echo "Remember to add \`LT_INIT' to \`$configure_ac'."        $seen_ltdl ||
839            func_echo "Consider adding \`LT_WITH_LTDL' to $configure_ac"
840    
841          # Remind the user to call LT_CONFIG_LTDL_DIR:
842          test -n "$ac_ltdldir" ||
843            func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([[$ltdldir]])' to \`$configure_ac'."
844    
845          # Offer some suggestions for avoiding duplicate files in a project
846          # that uses libltdl:
847          test "$ltdldir/config" = "$auxdir" ||
848            func_echo "Consider using \`AC_CONFIG_AUX_DIR([[$ltdldir/config]])' in $configure_ac."
849          $ac_config_macro_dir_advised || test "$ltdldir/m4" = "$m4dir" ||
850            func_echo "Consider using \`AC_CONFIG_MACRO_DIR([[$ltdldir/m4]])' in $configure_ac."
851        else
852          # Don't trace for this, we're just checking the user didn't invoke it
853          # directly from configure.ac.
854          $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB &&
855            func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"
856        fi
857    
858      # FIXME: Ensure ltmain.sh, libtool.m4 and ltdl.m4 are from the same release      # FIXME: Ensure ltmain.sh, libtool.m4 and ltdl.m4 are from the same release
859  }  }
# Line 942  func_nonemptydir_p () Line 991  func_nonemptydir_p ()
991    glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'    glob_exclude_pkgaux_files='config.guess|config.sub|install-sh|ltmain.sh'
992    
993    func_scan_files    func_scan_files
   $opt_quiet || func_check_macros  
994    
995    # Copy all the files from installed libltdl to this project, if the    # Copy all the files from installed libltdl to this project, if the
996    # user specified `--ltdl'.    # user specified `--ltdl'.
# Line 997  func_nonemptydir_p () Line 1045  func_nonemptydir_p ()
1045        "$m4dir" func_serial_update        "$m4dir" func_serial_update
1046    fi    fi
1047    
1048    # Suggest modern idioms for storing autoconf macros:    $opt_quiet || func_check_macros
   $opt_quiet || \  
     if $seen_autoconf; then  
       ac_config_macro_dir_advised=false  
   
       if test -z "$macrodir$ltdldir"; then  
         if test x"$m4dir" = x.; then  
           func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and rerunning"  
           func_echo " libtoolize, to keep the correct libtool macros in-tree."  
         else  
           func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to $configure.ac,"  
           func_echo "and rerunning libtoolize."  
         fi  
       elif test -z "$m4dir"; then  
         if test "$ltdldir/m4" != "$m4dir"; then  
           acmacrodir="$ltdldir/m4"  
         else  
           acmacrodir="$aclocaldir"  
         fi  
   
         func_echo "You should add the contents of the following files to \`aclocal.m4':"  
         for need in libtool.m4 ltoptions.m4 ltversion.m4 ltsugar.m4; do  
           func_echo "\`$acmacrodir/$need'"  
         done  
         if $seen_ltdl || $opt_ltdl; then  
           for need in argz.m4 ltdl.m4; do  
             func_echo "\`$acmacrodir/$need'"  
           done  
         fi  
         if test "$acmacrodir" != "$aclocaldir"; then  
           func_echo "or else add \`AC_CONFIG_MACRO_DIR([[$acmacrodir]])' to $configure_ac."  
           ac_config_macro_dir_advised=:  
         fi  
       fi  
   
       if $opt_ltdl; then  
         # Remind the user to call LT_CONFIG_LTDL_DIR:  
         test -n "$ac_ltdldir" ||  
           func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([[$ltdldir]])' to \`$configure_ac'."  
   
         # Offer some suggestions for avoiding duplicate files in a project  
         # that uses libltdl:  
         test "$ltdldir/config" = "$auxdir" ||  
           func_echo "Consider using \`AC_CONFIG_AUX_DIR([[$ltdldir/config]])' in $configure_ac."  
         $ac_config_macro_dir_advised || test "$ltdldir/m4" = "$m4dir" ||  
           func_echo "Consider using \`AC_CONFIG_MACRO_DIR([[$ltdldir/m4]])' in $configure_ac."  
       fi  
     fi  
1049  }  }
1050    
1051  exit $exit_status  exit $exit_status

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39

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