*** Local/Makefile.ORIG Fri Mar 28 08:54:35 2008 --- Local/Makefile Fri Mar 28 09:29:51 2008 *************** *** 100,106 **** # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. ! BIN_DIRECTORY=/usr/exim/bin #------------------------------------------------------------------------------ --- 100,106 ---- # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. ! BIN_DIRECTORY=/opt/freeware/bin #------------------------------------------------------------------------------ *************** *** 116,122 **** # don't exist. It will also install a default runtime configuration if this # file does not exist. ! CONFIGURE_FILE=/usr/exim/configure # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. # In this case, Exim will use the first of them that exists when it is run. --- 116,122 ---- # don't exist. It will also install a default runtime configuration if this # file does not exist. ! CONFIGURE_FILE=/etc/exim/exim.conf # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. # In this case, Exim will use the first of them that exists when it is run. *************** *** 134,140 **** # owner of a local mailbox.) Specifying these values as root is very strongly # discouraged. ! EXIM_USER= # If you specify EXIM_USER as a name, this is looked up at build time, and the # uid number is built into the binary. However, you can specify that this --- 134,140 ---- # owner of a local mailbox.) Specifying these values as root is very strongly # discouraged. ! EXIM_USER=ref:exim # If you specify EXIM_USER as a name, this is looked up at build time, and the # uid number is built into the binary. However, you can specify that this *************** *** 188,194 **** # options in INCLUDE. If you want the extra searches only for certain # parts of the build, see more specific xxx_INCLUDE variables below. ! # INCLUDE=-I/example/include # You need to specify some routers and transports if you want the Exim that you # are building to be capable of delivering mail. You almost certainly need at --- 188,194 ---- # options in INCLUDE. If you want the extra searches only for certain # parts of the build, see more specific xxx_INCLUDE variables below. ! INCLUDE=-I/opt/freeware/include # You need to specify some routers and transports if you want the Exim that you # are building to be capable of delivering mail. You almost certainly need at *************** *** 272,278 **** # LOOKUP_ORACLE=yes # LOOKUP_PASSWD=yes # LOOKUP_PGSQL=yes ! # LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes # These two settings are obsolete; all three lookups are compiled when --- 272,278 ---- # LOOKUP_ORACLE=yes # LOOKUP_PASSWD=yes # LOOKUP_PGSQL=yes ! LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes # These two settings are obsolete; all three lookups are compiled when *************** *** 310,315 **** --- 310,316 ---- # LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include # LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 + LOOKUP_LIBS=-L/opt/freeware/lib -lsqlite3 #------------------------------------------------------------------------------ *************** *** 576,589 **** # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) ! # SUPPORT_TLS=yes # Uncomment this setting if you are using OpenSSL ! # TLS_LIBS=-lssl -lcrypto # Uncomment these settings if you are using GnuTLS ! # USE_GNUTLS=yes ! # TLS_LIBS=-lgnutls -ltasn1 -lgcrypt # If you are running Exim as a server, note that just building it with TLS # support is not all you need to do. You also need to set up a suitable --- 577,590 ---- # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) ! SUPPORT_TLS=yes # Uncomment this setting if you are using OpenSSL ! # TLS_LIBS=-L/opt/freeware/lib -lssl -lcrypto # Uncomment these settings if you are using GnuTLS ! USE_GNUTLS=yes ! TLS_LIBS=-L/opt/freeware/lib -lgnutls -ltasn1 -lgcrypt # If you are running Exim as a server, note that just building it with TLS # support is not all you need to do. You also need to set up a suitable *************** *** 630,636 **** # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. ! # INFO_DIRECTORY=/usr/share/info #------------------------------------------------------------------------------ --- 631,637 ---- # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. ! INFO_DIRECTORY=/opt/freeware/info #------------------------------------------------------------------------------ *************** *** 655,661 **** # files, by settings such as these # LOG_FILE_PATH=syslog ! # LOG_FILE_PATH=syslog:/var/log/exim_%slog # The first of these uses only syslog; the second uses syslog and also writes # to log files. Do not include white space in such a setting as it messes up --- 656,662 ---- # files, by settings such as these # LOG_FILE_PATH=syslog ! LOG_FILE_PATH=syslog:/var/log/exim_%slog # The first of these uses only syslog; the second uses syslog and also writes # to log files. Do not include white space in such a setting as it messes up *************** *** 700,706 **** # If the exigrep utility is fed compressed log files, it tries to uncompress # them using this command. ! ZCAT_COMMAND=/usr/bin/zcat #------------------------------------------------------------------------------ --- 701,707 ---- # If the exigrep utility is fed compressed log files, it tries to uncompress # them using this command. ! ZCAT_COMMAND=/opt/freeware/bin/zcat #------------------------------------------------------------------------------ *************** *** 1082,1088 **** # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: ! # PID_FILE_PATH=/var/lock/exim.pid # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". --- 1083,1089 ---- # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: ! PID_FILE_PATH=/var/run/exim.pid # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". There are no differences between the files. *** OS/Makefile-AIX.ORIG Thu Mar 27 16:37:59 2008 --- OS/Makefile-AIX Fri Mar 28 09:21:40 2008 *************** *** 11,17 **** # Note that nowadays you have to pay extra for a cc compiler with AIX! ! CC=gcc # This needs to be in here rather than os.h-AIX because of regexp stuff. # basically strchr is a #define, which means "extern char *strchr()" --- 11,17 ---- # Note that nowadays you have to pay extra for a cc compiler with AIX! ! CC=xlc # This needs to be in here rather than os.h-AIX because of regexp stuff. # basically strchr is a #define, which means "extern char *strchr()" *************** *** 21,27 **** # using gcc. Commented out by PH. #CFLAGS = -D__STR31__ ! CFLAGS = -mcpu=power4 -maix64 -O3 # Needed for vfork() and vfork() only? --- 21,29 ---- # using gcc. Commented out by PH. #CFLAGS = -D__STR31__ ! CFLAGS = -q32 -O ! ! LFLAGS = -L/opt/freeware/lib # Needed for vfork() and vfork() only?