1999-12-23 16:18:36 +00:00
|
|
|
*** config/options.h-vanilla.orig Mon May 20 11:11:25 1996
|
|
|
|
--- config/options.h-vanilla Fri Dec 3 00:29:56 1999
|
1995-03-01 00:23:26 +00:00
|
|
|
***************
|
1995-03-01 00:52:57 +00:00
|
|
|
*** 42,51 ****
|
1995-03-01 00:23:26 +00:00
|
|
|
* LIBEXEC_DIR - Internal support programs
|
|
|
|
* MAN_DIR - Man pages
|
|
|
|
*/
|
|
|
|
! #define CONFIG_DIR "/etc/amanda"
|
1999-12-23 16:18:36 +00:00
|
|
|
! #define LIBEXEC_DIR "/usr/local/libexec/amanda"
|
|
|
|
! #define BIN_DIR "/usr/local/sbin"
|
1995-03-01 00:52:57 +00:00
|
|
|
! #define MAN_DIR "/usr/share/local/man/man8"
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
--- 42,51 ----
|
1995-03-01 00:23:26 +00:00
|
|
|
* LIBEXEC_DIR - Internal support programs
|
|
|
|
* MAN_DIR - Man pages
|
|
|
|
*/
|
1999-12-23 16:18:36 +00:00
|
|
|
! #define CONFIG_DIR "%%PREFIX%%/etc/amanda"
|
|
|
|
! #define LIBEXEC_DIR "%%PREFIX%%/libexec/amanda"
|
|
|
|
! #define BIN_DIR "%%PREFIX%%/sbin"
|
|
|
|
! #define MAN_DIR "%%PREFIX%%/man/man8"
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
***************
|
|
|
|
*** 53,66 ****
|
|
|
|
* I compile with -g to compile in a full symbol table, but you might choose
|
|
|
|
* to use -O or something else.
|
|
|
|
*/
|
|
|
|
! #define MK_CCOPTS -g
|
|
|
|
/*
|
|
|
|
* You can also redefine MK_CC here if you wish to override the system
|
|
|
|
* dependent C compiler. If you have a stable version of GCC, you may
|
|
|
|
* well want to use that instead of the system compiler.
|
|
|
|
*/
|
|
|
|
! /* #undef MK_CC */
|
|
|
|
! /* #define MK_CC gcc -Wall */
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
--- 53,68 ----
|
|
|
|
* I compile with -g to compile in a full symbol table, but you might choose
|
|
|
|
* to use -O or something else.
|
|
|
|
*/
|
|
|
|
! #define MK_CCOPTS %%CFLAGS%%
|
|
|
|
/*
|
|
|
|
* You can also redefine MK_CC here if you wish to override the system
|
|
|
|
* dependent C compiler. If you have a stable version of GCC, you may
|
|
|
|
* well want to use that instead of the system compiler.
|
|
|
|
*/
|
|
|
|
! #undef MK_INSTALL
|
|
|
|
! #define MK_INSTALL %%INSTALL%%
|
|
|
|
! #undef MK_CC
|
|
|
|
! #define MK_CC %%CC%%
|
1995-03-01 00:52:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
1995-03-01 00:23:26 +00:00
|
|
|
***************
|
|
|
|
*** 77,83 ****
|
|
|
|
* Since 2.2.1 is a major change, I recommend defining this for existing
|
|
|
|
* Amanda sites.
|
|
|
|
*/
|
|
|
|
! #define USE_VERSION_SUFFIXES
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
1999-12-23 16:18:36 +00:00
|
|
|
--- 79,85 ----
|
1995-03-01 00:23:26 +00:00
|
|
|
* Since 2.2.1 is a major change, I recommend defining this for existing
|
|
|
|
* Amanda sites.
|
|
|
|
*/
|
|
|
|
! /*#define USE_VERSION_SUFFIXES*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
***************
|
1999-12-23 16:18:36 +00:00
|
|
|
*** 182,198 ****
|
1995-03-01 00:23:26 +00:00
|
|
|
#define HAVE_GZIP
|
|
|
|
|
|
|
|
#ifdef HAVE_GZIP
|
|
|
|
! # define COMPRESS_PATH "/usr/imports/bin/gzip"
|
|
|
|
# define COMPRESS_SUFFIX ".gz"
|
|
|
|
# define COMPRESS_FAST_OPT "--fast"
|
|
|
|
# define COMPRESS_BEST_OPT "--best"
|
|
|
|
! # define UNCOMPRESS_CMD "gzcat"
|
|
|
|
#else
|
|
|
|
# define COMPRESS_PATH COMPRESS /* defined in config.h */
|
|
|
|
# define COMPRESS_SUFFIX ".Z"
|
|
|
|
# define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
|
|
|
|
# define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
|
|
|
|
! # define UNCOMPRESS_CMD "zcat"
|
|
|
|
#endif
|
1999-12-23 16:18:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
--- 184,200 ----
|
1995-03-01 00:23:26 +00:00
|
|
|
#define HAVE_GZIP
|
|
|
|
|
|
|
|
#ifdef HAVE_GZIP
|
|
|
|
! # define COMPRESS_PATH "/usr/bin/gzip"
|
|
|
|
# define COMPRESS_SUFFIX ".gz"
|
|
|
|
# define COMPRESS_FAST_OPT "--fast"
|
|
|
|
# define COMPRESS_BEST_OPT "--best"
|
|
|
|
! # define UNCOMPRESS_CMD "/usr/bin/gzcat"
|
|
|
|
#else
|
|
|
|
# define COMPRESS_PATH COMPRESS /* defined in config.h */
|
|
|
|
# define COMPRESS_SUFFIX ".Z"
|
|
|
|
# define COMPRESS_FAST_OPT "-f" /* -f doesn't do anything */
|
|
|
|
# define COMPRESS_BEST_OPT "-f" /* it's just a placeholder */
|
|
|
|
! # define UNCOMPRESS_CMD "/usr/bin/zcat"
|
|
|
|
#endif
|
1999-12-23 16:18:36 +00:00
|
|
|
|
|
|
|
/*
|