Selaa lähdekoodia

Refer user to INSTALL file when integrating with sendmail on OpenBSD or

FreeBSD.


git-svn-id: https://svn.microneil.com/svn/SNFUtility/trunk@46 aa37657e-1934-4a5f-aa6d-2d8eab27ff7c
master
adeniz 12 vuotta sitten
vanhempi
commit
8e2441f549
2 muutettua tiedostoa jossa 7 lisäystä ja 1 poistoa
  1. 2
    1
      SNFMilterConfig/Makefile.am
  2. 5
    0
      SNFMilterConfig/SNFMilterConfig.cpp

+ 2
- 1
SNFMilterConfig/Makefile.am Näytä tiedosto

@@ -15,7 +15,8 @@ LIBS = @SNF_LIBS@ -L../../SNFMulti -L../../CodeDweller -L../Common -lUtilityComm
-lSNFMulti -lCodeDweller @LIBS@

CXXFLAGS = $(SNF_CXXFLAGS) -I@top_srcdir@/SNFMulti -I@top_srcdir@/CodeDweller \
-I@top_srcdir@/SNFUtility/Common -DDEFAULT_CONFIG_DIR=\"@sysconfdir@\"
-I@top_srcdir@/SNFUtility/Common -DDEFAULT_CONFIG_DIR=\"@sysconfdir@\" \
-DDOC_DIR=\"@docdir@\"

sbin_PROGRAMS = \
SNFMilterConfig

+ 5
- 0
SNFMilterConfig/SNFMilterConfig.cpp Näytä tiedosto

@@ -40,6 +40,7 @@ using namespace std;
const std::string SNFMilterConfig::DefaultConfigFile("C:\\SNF\\SNFMilter.xml");
const std::string SNFMilterConfig::SampleConfigFile("C:\\SNF\\SNFMilter.xml.sample");
const std::string SNFMilterConfig::SampleIdentityFile("C:\\SNF\\identity.xml.sample");
const std::string InstallFile("");
#else
@@ -48,6 +49,7 @@ const std::string SNFMilterConfig::SampleIdentityFile("C:\\SNF\\identity.xml.sam
const std::string SNFMilterConfig::DefaultConfigFile(DEFAULT_CONFIG_DIR "/snf-milter/SNFMilter.xml");
const std::string SNFMilterConfig::SampleConfigFile(DEFAULT_CONFIG_DIR "/snf-milter/SNFMilter.xml.sample");
const std::string SNFMilterConfig::SampleIdentityFile(DEFAULT_CONFIG_DIR "/snf-milter/identity.xml.sample");
const std::string InstallFile(DOC_DIR "/INSTALL");
#else
// Not Windows, and DEFAULT_CONFIG_DIR is not specified on the compile
// command line. In this case, we don't know the default path for the
@@ -55,6 +57,7 @@ const std::string SNFMilterConfig::SampleIdentityFile(DEFAULT_CONFIG_DIR "/snf-m
const std::string SNFMilterConfig::DefaultConfigFile("");
const std::string SNFMilterConfig::SampleConfigFile("");
const std::string SNFMilterConfig::SampleIdentityFile("");
const std::string InstallFile("INSTALL");
#endif
#endif
@@ -133,6 +136,8 @@ SNFMilterConfig::GetCommandLineInput(int argc, char* argv[]) {
Temp = "Integration with sendmail is not supported on " + OsType;
Temp += ".\n";
Temp += "Please see " + InstallFile;
Temp += " for information on integration with sendmail.\n";
throw std::runtime_error(Temp);

Loading…
Peruuta
Tallenna