[Orca-checkins] r444 - in trunk/orca: . packages
blair at orcaware.com
blair at orcaware.com
Tue May 3 19:02:28 PDT 2005
Author: blair at orcaware.com
Date: Tue May 3 19:01:29 2005
New Revision: 444
Modified:
trunk/orca/configure.in
trunk/orca/packages/Makefile.in
Log:
Remove all of the infrastructure to build and install the Perl
Compress::Zlib module which was never used. If any structure is put
in place, it'll be for IO::Zlib, which makes it very easy to read
compressed files.
* configure.in:
Remove commented out code to check for the installed version of
Compress::Zlib.
Do not substitute the following autoconf variables:
@COMPRESS_ZLIB_DIR@
@COMPRESS_ZLIB_VER@
@MAKE_COMPRESS_ZLIB@
@TEST_COMPRESS_ZLIB@
@INSTALL_PERL_COMPRESS_ZLIB@
@CLEAN_COMPRESS_ZLIB@
@DISTCLEAN_COMPRESS_ZLIB@
* packages/Makefile.in:
Remove all variables and targets to build Compress::Zlib.
Modified: trunk/orca/configure.in
==============================================================================
--- trunk/orca/configure.in (original)
+++ trunk/orca/configure.in Tue May 3 19:01:29 2005
@@ -25,8 +25,6 @@
# Define the directories containing packages that Orca makes use of here.
# The directory name packages where these packages are distributed with
# Orca gets added where necessary.
-COMPRESS_ZLIB_DIR=Compress-Zlib-1.05
-COMPRESS_ZLIB_VER=1.05
DATA_DUMPER_DIR=Data-Dumper-2.101
DATA_DUMPER_VER=2.101
DATE_PARSE_DIR=TimeDate-1.16
@@ -44,7 +42,6 @@
TIME_HIRES_DIR=Time-HiRes-1.66
TIME_HIRES_VER=1.66
-AC_SUBST(COMPRESS_ZLIB_DIR)
AC_SUBST(DATA_DUMPER_DIR)
AC_SUBST(DATE_PARSE_DIR)
AC_SUBST(DEVEL_DPROF_DIR)
@@ -54,7 +51,6 @@
AC_SUBST(STORABLE_DIR)
AC_SUBST(TIME_HIRES_DIR)
-AC_SUBST(COMPRESS_ZLIB_VER)
AC_SUBST(DATA_DUMPER_VER)
AC_SUBST(DATE_PARSE_VER)
AC_SUBST(DEVEL_DPROF_VER)
@@ -364,24 +360,6 @@
# options for RRDtool if it is not already declared.
# expr "$ORCA_CONFIGURE_COMMAND_LINE" : "--enable-shared" >/dev/null 2>&1 || ORCA_CONFIGURE_COMMAND_LINE="$ORCA_CONFIGURE_COMMAND_LINE --enable-shared"
-dnl BORP_PERL_MODULE(orca_cv_perl_module_compress_zlib,
-dnl $PERL,
-dnl Compress::Zlib,
-dnl $COMPRESS_ZLIB_VER)
-dnl test "$ALWAYS_BUILD_PERL_MODULES" && orca_cv_perl_module_compress_zlib=no
-dnl if test "$orca_cv_perl_module_compress_zlib" = no; then
-dnl MAKE_COMPRESS_ZLIB=make_compress_zlib
-dnl TEST_COMPRESS_ZLIB=test_compress_zlib
-dnl INSTALL_PERL_COMPRESS_ZLIB=install_perl_compress_zlib
-dnl CLEAN_COMPRESS_ZLIB=clean_compress_zlib
-dnl DISTCLEAN_COMPRESS_ZLIB=distclean_compress_zlib
-dnl fi
-AC_SUBST(MAKE_COMPRESS_ZLIB)
-AC_SUBST(TEST_COMPRESS_ZLIB)
-AC_SUBST(INSTALL_PERL_COMPRESS_ZLIB)
-AC_SUBST(CLEAN_COMPRESS_ZLIB)
-AC_SUBST(DISTCLEAN_COMPRESS_ZLIB)
-
BORP_PERL_MODULE(orca_cv_perl_module_data_dumper,
$PERL,
Data::Dumper,
Modified: trunk/orca/packages/Makefile.in
==============================================================================
--- trunk/orca/packages/Makefile.in (original)
+++ trunk/orca/packages/Makefile.in Tue May 3 19:01:29 2005
@@ -10,7 +10,6 @@
# instead of the newer installed module.
UNINST = 1
-compress_zlib_dir = @COMPRESS_ZLIB_DIR@
data_dumper_dir = @DATA_DUMPER_DIR@
date_parse_dir = @DATE_PARSE_DIR@
devel_dprof_dir = @DEVEL_DPROF_DIR@
@@ -19,7 +18,6 @@
rrdtool_dir = @RRDTOOL_DIR@
storable_dir = @STORABLE_DIR@
-MAKE_COMPRESS_ZLIB = @MAKE_COMPRESS_ZLIB@
MAKE_DATA_DUMPER = @MAKE_DATA_DUMPER@
MAKE_DATE_PARSE = @MAKE_DATE_PARSE@
MAKE_DEVEL_DPROF = @MAKE_DEVEL_DPROF@
@@ -27,8 +25,7 @@
MAKE_MATH_INTERVALSEARCH = @MAKE_MATH_INTERVALSEARCH@
MAKE_RRDTOOL = @MAKE_RRDTOOL@
MAKE_STORABLE = @MAKE_STORABLE@
-MAKE_TARGETS = $(MAKE_COMPRESS_ZLIB) \
- $(MAKE_DATA_DUMPER) \
+MAKE_TARGETS = $(MAKE_DATA_DUMPER) \
$(MAKE_DATE_PARSE) \
$(MAKE_DEVEL_DPROF) \
$(MAKE_DIGEST_MD5) \
@@ -36,7 +33,6 @@
$(MAKE_RRDTOOL) \
$(MAKE_STORABLE)
-TEST_COMPRESS_ZLIB = @TEST_COMPRESS_ZLIB@
TEST_DATA_DUMPER = @TEST_DATA_DUMPER@
TEST_DATE_PARSE = @TEST_DATE_PARSE@
TEST_DEVEL_DPROF = @TEST_DEVEL_DPROF@
@@ -44,8 +40,7 @@
TEST_MATH_INTERVALSEARCH = @TEST_MATH_INTERVALSEARCH@
TEST_RRDTOOL = @TEST_RRDTOOL@
TEST_STORABLE = @TEST_STORABLE@
-TEST_TARGETS = $(TEST_COMPRESS_ZLIB) \
- $(TEST_DATA_DUMPER) \
+TEST_TARGETS = $(TEST_DATA_DUMPER) \
$(TEST_DATE_PARSE) \
$(TEST_DEVEL_DPROF) \
$(TEST_DIGEST_MD5) \
@@ -53,7 +48,6 @@
$(TEST_RRDTOOL) \
$(TEST_STORABLE)
-INSTALL_PERL_COMPRESS_ZLIB = @INSTALL_PERL_COMPRESS_ZLIB@
INSTALL_PERL_DATA_DUMPER = @INSTALL_PERL_DATA_DUMPER@
INSTALL_PERL_DATE_PARSE = @INSTALL_PERL_DATE_PARSE@
INSTALL_PERL_DEVEL_DPROF = @INSTALL_PERL_DEVEL_DPROF@
@@ -61,8 +55,7 @@
INSTALL_PERL_MATH_INTERVALSEARCH = @INSTALL_PERL_MATH_INTERVALSEARCH@
INSTALL_PERL_RRDTOOL = @INSTALL_PERL_RRDTOOL@
INSTALL_PERL_STORABLE = @INSTALL_PERL_STORABLE@
-INSTALL_PERL_TARGETS = $(INSTALL_PERL_COMPRESS_ZLIB) \
- $(INSTALL_PERL_DATA_DUMPER) \
+INSTALL_PERL_TARGETS = $(INSTALL_PERL_DATA_DUMPER) \
$(INSTALL_PERL_DATE_PARSE) \
$(INSTALL_PERL_DEVEL_DPROF) \
$(INSTALL_PERL_DIGEST_MD5) \
@@ -73,7 +66,6 @@
INSTALL_LIB_RRDTOOL = @INSTALL_LIB_RRDTOOL@
INSTALL_LIB_TARGETS = $(INSTALL_LIB_RRDTOOL)
-CLEAN_COMPRESS_ZLIB = @CLEAN_COMPRESS_ZLIB@
CLEAN_DATA_DUMPER = @CLEAN_DATA_DUMPER@
CLEAN_DATE_PARSE = @CLEAN_DATE_PARSE@
CLEAN_DEVEL_DPROF = @CLEAN_DEVEL_DPROF@
@@ -81,8 +73,7 @@
CLEAN_MATH_INTERVALSEARCH = @CLEAN_MATH_INTERVALSEARCH@
CLEAN_RRDTOOL = @CLEAN_RRDTOOL@
CLEAN_STORABLE = @CLEAN_STORABLE@
-CLEAN_TARGETS = $(CLEAN_COMPRESS_ZLIB) \
- $(CLEAN_DATA_DUMPER) \
+CLEAN_TARGETS = $(CLEAN_DATA_DUMPER) \
$(CLEAN_DATE_PARSE) \
$(CLEAN_DEVEL_DPROF) \
$(CLEAN_DIGEST_MD5) \
@@ -90,7 +81,6 @@
$(CLEAN_RRDTOOL) \
$(CLEAN_STORABLE)
-DISTCLEAN_COMPRESS_ZLIB = @DISTCLEAN_COMPRESS_ZLIB@
DISTCLEAN_DATA_DUMPER = @DISTCLEAN_DATA_DUMPER@
DISTCLEAN_DATE_PARSE = @DISTCLEAN_DATE_PARSE@
DISTCLEAN_DEVEL_DPROF = @DISTCLEAN_DEVEL_DPROF@
@@ -98,8 +88,7 @@
DISTCLEAN_MATH_INTERVALSEARCH = @DISTCLEAN_MATH_INTERVALSEARCH@
DISTCLEAN_RRDTOOL = @DISTCLEAN_RRDTOOL@
DISTCLEAN_STORABLE = @DISTCLEAN_STORABLE@
-DISTCLEAN_TARGETS = $(DISTCLEAN_COMPRESS_ZLIB) \
- $(DISTCLEAN_DATA_DUMPER) \
+DISTCLEAN_TARGETS = $(DISTCLEAN_DATA_DUMPER) \
$(DISTCLEAN_DATE_PARSE) \
$(DISTCLEAN_DEVEL_DPROF) \
$(DISTCLEAN_DIGEST_MD5) \
@@ -109,12 +98,6 @@
all: Makefile $(MAKE_TARGETS)
-make_compress_zlib: make_rrdtool_zlib $(compress_zlib_dir)/Makefile
- cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
-
-$(compress_zlib_dir)/Makefile: $(compress_zlib_dir)/Makefile.PL $(PERL)
- cd $(compress_zlib_dir) && $(PERL) Makefile.PL
-
make_data_dumper: $(data_dumper_dir)/Makefile
cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)"
@@ -148,9 +131,6 @@
make_rrdtool: $(rrdtool_dir)/Makefile $(PERL)
cd $(rrdtool_dir) && $(MAKE) CFLAGS="$(CFLAGS)"
-make_rrdtool_zlib: $(rrdtool_dir)/Makefile $(PERL)
- cd $(rrdtool_dir) && $(MAKE) CFLAGS="$(CFLAGS)" zlib-1.1.3/librrd_z.a
-
$(rrdtool_dir)/Makefile: $(rrdtool_dir)/config.status $(rrdtool_dir)/Makefile.in
cd $(rrdtool_dir) && CONFIG_FILES=Makefile ./config.status
@@ -167,9 +147,6 @@
test_modules: $(TEST_TARGETS)
-test_compress_zlib: make_rrdtool_zlib $(compress_zlib_dir)/Makefile
- cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" test
-
test_data_dumper: $(data_dumper_dir)/Makefile
cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" test
@@ -198,9 +175,6 @@
install_modules: $(INSTALL_PERL_TARGETS)
-install_perl_compress_zlib: make_compress_zlib
- cd $(compress_zlib_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
-
install_perl_data_dumper: $(data_dumper_dir)/Makefile
cd $(data_dumper_dir) && $(MAKE) OPTIMIZE="$(CFLAGS)" UNINST="$(UNINST)" install
@@ -224,12 +198,6 @@
clean: $(CLEAN_TARGETS)
-clean_compress_zlib: clean_rrdtool
- @if test -r $(compress_zlib_dir)/Makefile; then \
- echo 'cd $(compress_zlib_dir) && $(MAKE) clean'; \
- (cd $(compress_zlib_dir) && $(MAKE) clean); \
- fi
-
clean_data_dumper:
@if test -r $(data_dumper_dir)/Makefile; then \
echo 'cd $(data_dumper_dir) && $(MAKE) clean'; \
@@ -272,8 +240,6 @@
distclean: $(DISTCLEAN_TARGETS)
$(RM) Makefile
-distclean_compress_zlib: clean_compress_zlib
-
distclean_data_dumper: clean_data_dumper
distclean_date_parse: clean_date_parse
More information about the Orca-checkins
mailing list