[llvm-commits] CVS: llvm/configure Makefile.rules Makefile.config.in

[Reid Spencer]

Changes in directory llvm:

configure updated: 1.126 -> 1.127
Makefile.rules updated: 1.199 -> 1.200
Makefile.config.in updated: 1.31 -> 1.32
---
Log message:

Provide support for auto-detection and use of compression libraries.


---
Diffs of the changes:  (+25 -7)

Index: llvm/configure
diff -u llvm/configure:1.126 llvm/configure:1.127
--- llvm/configure:1.126	Sat Oct  2 03:50:57 2004
+++ llvm/configure	Mon Oct  4 02:05:05 2004
@@ -473,7 +473,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DOT ETAGS ETAGSFLAGS PYTHON QMTEST ENDIAN ALLOCA MMAP_FILE ENABLE_OPTIMIZED JIT LLVMCC1 LLVMCC1PLUS SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLV!
 M_CONFIGTIME LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS subdirs INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVMGCCDIR ARCH CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP ifGNUmake LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DOT ETAGS ETAGSFLAGS PYTHON QMTEST HAVE_ZLIB HAVE_BZIP2 ENDIAN ALLOCA MMAP_FILE ENABLE_OPTIMIZED JIT LLVMCC1 LLVMCC1PLUS SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_IN!
 FODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -19339,6 +19339,10 @@
   zlib_found=0
 fi
 
+HAVE_ZLIB=$zlib_found
+
+HAVE_BZIP2=$bzip2_found
+
 if test $zlib_found -eq 1 ; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -24853,6 +24857,8 @@
 s, at ETAGSFLAGS@,$ETAGSFLAGS,;t t
 s, at PYTHON@,$PYTHON,;t t
 s, at QMTEST@,$QMTEST,;t t
+s, at HAVE_ZLIB@,$HAVE_ZLIB,;t t
+s, at HAVE_BZIP2@,$HAVE_BZIP2,;t t
 s, at ENDIAN@,$ENDIAN,;t t
 s, at ALLOCA@,$ALLOCA,;t t
 s, at MMAP_FILE@,$MMAP_FILE,;t t


Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.199 llvm/Makefile.rules:1.200
--- llvm/Makefile.rules:1.199	Tue Sep 28 09:52:58 2004
+++ llvm/Makefile.rules	Mon Oct  4 02:05:06 2004
@@ -463,8 +463,8 @@
 	$(MKDIR) $(sysconfdir)
 
 install-config-files: $(sysconfdir) $(CONFIG_FILES)
-	$(VERB) echo Installing Configuration Files To $(sysconfdir)
-	$(VERB) for file in $(CONFIG_FILES); do \
+	$(VERB)$(ECHO) Installing Configuration Files To $(sysconfdir)
+	$(VERB)for file in $(CONFIG_FILES); do \
 		$(INSTALL) $(SourceDir)/$${file} $(sysconfdir) ; \
 	done
 endif
@@ -527,7 +527,7 @@
 
 $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc: $(LIBNAME_BC) $(DESTDIR)$(bytecode_libdir)
 	@${ECHO} ======= Installing $(LIBRARYNAME) bytecode library =======
-	cp $< $@
+	$(VERB)cp $< $@
 
 # Does the library want a .o version built?
 ifndef DONT_BUILD_RELINKED
@@ -593,7 +593,7 @@
 #
 $(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
 	@${ECHO} Linking $(LIBRARYNAME) archive release library
-	@$(RM) -f $@
+	$(VERB)$(RM) -f $@
 	$(VERB) $(Link) -03 -o $@ $(ObjectsO) $(LibSubDirs) -static
 	@${ECHO} Finished building $(LIBRARYNAME) archive release library =======
 
@@ -656,6 +656,13 @@
 #
 ifdef TOOLNAME
 
+# Handle compression libraries automatically
+ifeq ($(HAVE_BZIP2),1)
+USEDLIBS += bz2.a
+endif
+ifeq ($(HAVE_ZLIB),1)
+USEDLIBS += z.a
+endif
 # TOOLEXENAME* - These compute the output filenames to generate...
 TOOLEXENAME_G := $(DESTTOOLDEBUG)/$(TOOLNAME)
 TOOLEXENAME_O := $(DESTTOOLRELEASE)/$(TOOLNAME)
@@ -728,8 +735,9 @@
 	@${ECHO} ======= Finished building $(TOOLNAME) profile executable =======
 
 install:: $(TOOLEXENAMES)
-	$(MKDIR) $(DESTDIR)$(bindir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
+	@${ECHO} Installing $(TOOLEXENAMES) to $(DESTDIR)$(bindir)
+	$(VERB)$(MKDIR) $(DESTDIR)$(bindir)
+	$(VERB)$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
 
 endif
 


Index: llvm/Makefile.config.in
diff -u llvm/Makefile.config.in:1.31 llvm/Makefile.config.in:1.32
--- llvm/Makefile.config.in:1.31	Tue Sep  7 12:34:34 2004
+++ llvm/Makefile.config.in	Mon Oct  4 02:05:06 2004
@@ -155,6 +155,10 @@
 SourceDir=$(BUILD_SRC_DIR)
 endif
 
+# Handle configured libraries
+HAVE_BZIP2 := @HAVE_BZIP2@
+HAVE_ZILB  := @HAVE_ZLIB@
+
 # Installation directories, as provided by the configure script.
 exec_prefix = @exec_prefix@
 prefix = @prefix@