diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-09-24 15:57:55 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-09-24 15:57:55 -0700 |
| commit | 6504a6bbcd0a433decdf1feb11f60ef3ab2e29e1 (patch) | |
| tree | 70a94f23df5f354f2052d2bfe0575a67bbf90e43 /cpp | |
| parent | Bug 1808 - don't rely on config file for log output (diff) | |
| download | ice-6504a6bbcd0a433decdf1feb11f60ef3ab2e29e1.tar.bz2 ice-6504a6bbcd0a433decdf1feb11f60ef3ab2e29e1.tar.xz ice-6504a6bbcd0a433decdf1feb11f60ef3ab2e29e1.zip | |
migrate to Berkeley DB 4.8
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 6 | ||||
| -rw-r--r-- | cpp/demo/Freeze/backup/README | 4 | ||||
| -rwxr-xr-x | cpp/demo/Freeze/backup/backup | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 22315466ca4..5aaadbdc50b 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -161,9 +161,9 @@ ifneq ($(DB_HOME),) DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)) else - ifeq ($(shell if [ -d /usr/include/db47 -a -d /usr/$(libsubdir)/db47 ] ; then echo yes; fi), yes) - DB_FLAGS = -I/usr/include/db47 - DB_LIBS = -L/usr/$(libsubdir)/db47 -ldb_cxx + ifeq ($(shell if [ -d /usr/include/db48 -a -d /usr/$(libsubdir)/db48 ] ; then echo yes; fi), yes) + DB_FLAGS = -I/usr/include/db48 + DB_LIBS = -L/usr/$(libsubdir)/db48 -ldb_cxx else DB_LIBS = -ldb_cxx endif diff --git a/cpp/demo/Freeze/backup/README b/cpp/demo/Freeze/backup/README index a3ad4ca4028..d9a5f952757 100644 --- a/cpp/demo/Freeze/backup/README +++ b/cpp/demo/Freeze/backup/README @@ -19,8 +19,8 @@ db utility names ---------------- The Berkeley DB utilities are usually named db_hotbackup, db_archive, -db_recover, etc. If you use the Berkeley DB 4.7.25 RPMs provided by -ZeroC, the utility names are db47_hotbackup, db47_archive, etc. Please +db_recover, etc. If you use the Berkeley DB 4.8.24 RPMs provided by +ZeroC, the utility names are db48_hotbackup, db48_archive, etc. Please adjust the instructions below accordingly. diff --git a/cpp/demo/Freeze/backup/backup b/cpp/demo/Freeze/backup/backup index 504077d5f5b..9e61b493173 100755 --- a/cpp/demo/Freeze/backup/backup +++ b/cpp/demo/Freeze/backup/backup @@ -9,11 +9,11 @@ # ********************************************************************** # -# If you use a db47 RPM installation, the db utilities are -# named db47_xxx +# If you use a db48 RPM installation, the db utilities are +# named db48_xxx # db="db" -if [ -f /usr/bin/db47_hotbackup ]; then db="db47"; fi +if [ -f /usr/bin/db48_hotbackup ]; then db="db48"; fi case $1 in "full" | "incremental") echo "Performing $1 backup" |