test commit

[oota-llvm.git] / autoconf / README.TXT

diff --git a/autoconf/README.TXT b/autoconf/README.TXT
index 0e91beeab0fac9d9458bf214c3c766416ba10251..3dabdf7b8793e8f5565a38bf832c41b470521062 100644 (file)
--- a/autoconf/README.TXT
+++ b/autoconf/README.TXT
@@ -10,18 +10,28 @@ If you are in the mood to upgrade libtool, you must do the following:
  5. Copy <PFX>/share/libtool/ltmain.sh to llvm/autoconf/ltmain.sh
  6. Copy <PFX>/share/libtool/libltdl/ltdl.c to llvm/lib/System
  7. Copy <PFX>/share/libtool/libltdl/ltdl.h to llvm/lib/System
- 8. Adjust the llvm/autoconf/m4/libtool.m4 file to ensure that the variable
-    default_ofile is set to "mklib" instead of "libtool"
- 9. Run "autoupdate libtool.m4 ltdl.m4" in the llvm/autoconf/m4 directory.
+ 8. Edit the ltdl.h file to #include "llvm/Config/config.h" at the very top. You
+    might also need to resolve some compiler warnings (typically about
+    comparison of signed vs. unsigned values). But, you won't find out about 
+    those until you build LLVM (step 13).
+ 9. Edit the llvm/autoconf/m4/libtool.m4 file so that:
+    a) in AC_PROB_LIBTOOL macro, the value of LIBTOOL is set to
+       $(top_builddir)/mklib, not $(top_builddir)/libtool
+    b) in AC_LIBTOOL_SETUP macro, the variable default_ofile is set to 
+       "mklib" instead of "libtool"
+    c) s/AC_ENABLE_SHARED_DEFAULT/enable_shared_default/g
+    d) s/AC_ENABLE_STATIC_DEFAULT/enable_static_default/g
+    e) s/AC_ENABLE_FAST_INSTALL_DEFAULT/enable_fast_install_default/g
+10. Run "autoupdate libtool.m4 ltdl.m4" in the llvm/autoconf/m4 directory.
     This should correctly update the macro definitions in the libtool m4 
     files to match the version of autoconf that LLVM uses. This converts
     AC_HELP_STRING to AS_HELP_STRING and AC_TRY_LINK to AC_LINK_IFELSE, amongst
     other things. You may need to manually adjust the files.
-10. Run AutoRegen.sh to get the new macros into configure script
-11. If there are any warnings from configure, go to step 9.
-12. Rebuild LLVM, making sure it reconfigured
-13. Test the JIT which uses libltdl
-14. If it all works, only THEN commit the changes.
+11. Run AutoRegen.sh to get the new macros into configure script
+12. If there are any warnings from AutoRegen.sh, go to step 9.
+13. Rebuild LLVM, making sure it reconfigures
+14. Test the JIT which uses libltdl
+15. If it all works, only THEN commit the changes.
 
 Upgrading autoconf
 ===============================================================================
@@ -35,5 +45,5 @@ If you are in the mood to upgrade autoconf, you should:
  5. Run autoupdate on all the m4 macros in llvm/autoconf/m4
  6. Run autoupdate on llvm/autoconf/configure.ac
  7. Regenerate configure script with AutoRegen.sh
- 8. If there are any warnings from autoconf, fix them and go to step 7.
+ 8. If there are any warnings from AutoRegen.sh, fix them and go to step 7.
  9. Test, test, test.