PB: removed #ifdef NO_OFFICIAL_RELEASE

3 files changed, 5 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 8d2c38d..fb88112 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(Rasdaman, 8.0.0, p.baumann@jacobs-university.de)
+AC_INIT(Rasdaman, 8.0.0, baumann@rasdaman.com)
 RMANVERSION=8000
 AM_INIT_AUTOMAKE()
 # Define CXXFLAGS before AC_PROG_CXX or it will automatically add -g -O2 on some systems
@@ -151,7 +151,6 @@ AH_TEMPLATE([NO_in_addr_t], [Don't use addr_t.])
 AH_TEMPLATE([COMPDATE], [Date of the build (of the configure not the actual build)])
 AH_TEMPLATE([BASEDBSTRING], [Name of the database that supports the compiled version of rasdaman.])    
 AH_TEMPLATE([RASSCHEMAVERSION], [The version of the schema the database uses.])
-AH_TEMPLATE([NO_OFFICIAL_RELEASE], [activate this if you generate a "non-official" release, i.e.: without license check])
 AH_TEMPLATE([CONFDIR], [The directory where the installed programs will find their configuration])
 # --------------- Parameter Definition -----------------------------
 ####################################################################
@@ -285,7 +284,6 @@ AC_DEFINE([CPPSTDLIB])
 AC_DEFINE([X86]) # Currently, but the code supports multiple platforms
 AC_DEFINE([RASARCHITECTURE], ["X86"])
 AC_DEFINE([RASSCHEMAVERSION], [5])
-AC_DEFINE([NO_OFFICIAL_RELEASE])
 AC_DEFINE([NOPRE])
 # if not on DEC Alpha
 BASEDBLDFLAGS+=" -lnsl"
diff --git a/rasmgr/rasmgr_config.cc b/rasmgr/rasmgr_config.cc
index 6e317a7..68ed60a 100644
--- a/rasmgr/rasmgr_config.cc
+++ b/rasmgr/rasmgr_config.cc
@@ -66,13 +66,13 @@ Configuration::Configuration():
 	cmlMaster     (cmlInter.addStringParameter(CommandLineParser::noShortName, "master", "<name> host of rasmgr master (slave only)")), 
 	cmlMasterPort (cmlInter.addLongParameter(CommandLineParser::noShortName, "mport", "<port> listen port number of rasmgr master (slave only)", DEFAULT_PORT)),
 	cmlQuiet      (cmlInter.addFlagParameter( 'q', CommandLineParser::noLongName, "quiet: don't log requests (default: log requests to stdout)")),
-#ifdef NO_OFFICIAL_RELEASE          
+#ifdef RMANDEBUG	// was: NO_OFFICIAL_RELEASE
 	cmlTest       (cmlInter.addFlagParameter(CommandLineParser::noShortName, "test", "test mode")), 
 	cmlDSup       (cmlInter.addFlagParameter(CommandLineParser::noShortName, "dsup", "debug mode")), 
 	cmlRandTest   (cmlInter.addFlagParameter(CommandLineParser::noShortName, "rgt",  "random generator test")), 
 	cmlRth        (cmlInter.addFlagParameter(CommandLineParser::noShortName, "rth", "disable rthl test")),
 	cmlMultiWT    (cmlInter.addFlagParameter(CommandLineParser::noShortName, "amw", "allow multiple write transactions")),
-#endif	      	
+#endif	      	// RMANDEBUG
 	cmlHelp       (cmlInter.addFlagParameter('h', RASMGRCMD_HELP, "print this help"))
 {
 	ENTER( "Configuration::Configuration: enter." );
@@ -414,7 +414,7 @@ bool Configuration::interpretArguments(int argc, char **argv, char **envp)
 		}
 	}       
 		 
-#ifdef NO_OFFICIAL_RELEASE
+#ifdef RMANDEBUG	// was: NO_OFFICIAL_RELEASE
 	testModus = cmlTest.isPresent();
 	debugSupport=cmlDSup.isPresent();
 	rtHlTest=cmlRth.isPresent();
@@ -427,7 +427,7 @@ bool Configuration::interpretArguments(int argc, char **argv, char **envp)
 	
 	allowMultiWT = cmlMultiWT.isPresent();
 
-#endif       
+#endif       // RMANDEBUG
 
 	LEAVE( "Configuration::interpretArguments: leave. result=" << result );
 	return result;   
diff --git a/rasmgr/rasmgr_config.hh b/rasmgr/rasmgr_config.hh
index 0ed4d32..e2a24aa 100644
--- a/rasmgr/rasmgr_config.hh
+++ b/rasmgr/rasmgr_config.hh
@@ -110,9 +110,7 @@ class Configuration
       CommandLineParser    &cmlInter;
       CommandLineParameter &cmlHelp, &cmlHostName, &cmlPort, &cmlPollFrequ;
       CommandLineParameter &cmlMaster, &cmlMasterPort, &cmlName, &cmlQuiet;
-#ifdef RMANDEBUG
       CommandLineParameter &cmlTest, &cmlDSup, &cmlRandTest, &cmlRth, &cmlMultiWT;
-#endif
    };
    
 extern Configuration config;