X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=configure;h=cfda1a241df2dbf40dc285f90baa01cdd2742776;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=425bb21af75e4ba360860f3ed1da484d78cfcec0;hpb=50dd3523a3529fe542ec065fa68fb415a6b0e77a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/configure b/configure
index 425bb21af..cfda1a241 100755
--- a/configure
+++ b/configure
@@ -142,7 +142,7 @@ our %config = ();						   			# Initiate Configuration Hash..
 our $cache_loaded = getcache();
 $config{ME} = resolve_directory($topdir);				# Present Working Directory
 
-$config{BASE_DIR} = $config{ME}."/run";
+$config{BASE_DIR} ||= $config{ME}."/run";
 
 if (defined $opt_base_dir) {
 	$config{BASE_DIR} = $opt_base_dir;
@@ -159,13 +159,13 @@ if (defined $opt_system) {
 	$config{DATA_DIR}	 = '/var/inspircd';
 	$config{LOG_DIR}	 = '/var/log/inspircd';
 } else {
-	$config{UID} = $opt_uid || $<;
-	$config{CONFIG_DIR}	 = resolve_directory($config{BASE_DIR}."/conf");	# Configuration Directory
-	$config{MODULE_DIR}	 = resolve_directory($config{BASE_DIR}."/modules");	# Modules Directory
-	$config{BINARY_DIR}	 = resolve_directory($config{BASE_DIR}."/bin");		# Binary Directory
-	$config{BUILD_DIR}	 = resolve_directory($config{ME}."/build");         # Build Directory
-	$config{DATA_DIR}	 = resolve_directory($config{BASE_DIR}."/data");	# Data directory
-	$config{LOG_DIR}	 = resolve_directory($config{BASE_DIR}."/logs");	# Log directory
+	$config{UID} = $opt_uid || $config{UID} || $<;
+	$config{CONFIG_DIR}	 ||= resolve_directory($config{BASE_DIR}."/conf");	# Configuration Directory
+	$config{MODULE_DIR}	 ||= resolve_directory($config{BASE_DIR}."/modules");	# Modules Directory
+	$config{BINARY_DIR}	 ||= resolve_directory($config{BASE_DIR}."/bin");		# Binary Directory
+	$config{BUILD_DIR}	 ||= resolve_directory($config{ME}."/build");         # Build Directory
+	$config{DATA_DIR}	 ||= resolve_directory($config{BASE_DIR}."/data");	# Data directory
+	$config{LOG_DIR}	 ||= resolve_directory($config{BASE_DIR}."/logs");	# Log directory
 }
 
 if (defined $opt_config_dir) {
@@ -209,12 +209,12 @@ else
 
 chomp(our $gnutls_ver = $config{HAS_GNUTLS});
 chomp(our $openssl_ver = $config{HAS_OPENSSL});
-$config{USE_GNUTLS}	    = "n";
+$config{USE_GNUTLS}	    ||= "n";
 if (defined $opt_use_gnutls)
 {
 	$config{USE_GNUTLS} = "y";					# Use gnutls.
 }
-$config{USE_OPENSSL}	= "n";						# Use openssl.
+$config{USE_OPENSSL}	||= "n";						# Use openssl.
 if (defined $opt_use_openssl)
 {
 	$config{USE_OPENSSL} = "y";
@@ -257,7 +257,8 @@ if ($config{OSNAME} =~ /darwin/i)
 elsif ($config{OSNAME} =~ /freebsd/i)
 {
 	chomp(my $fbsd_version = `uname -r`);
-	$config{CC} = $fbsd_version ge '10.0' ? 'clang++' : 'g++';
+	$fbsd_version =~ s/^(\d+\.\d+).*/$1/g;
+	$config{CC} = $fbsd_version >= 10.0 ? 'clang++' : 'g++';
 }
 else
 {
@@ -609,8 +610,8 @@ should NOT be used. You should probably specify a newer compiler.\n\n";
 		$config{USE_FREEBSD_BASE_SSL} = "y" if ($^O eq "freebsd");
 	}
 
-	$config{USE_SSL} = "n";
-	$config{MODUPDATE} = 'n';
+	$config{USE_SSL} ||= "n";
+	$config{MODUPDATE} ||= 'n';
 
 	if ($config{HAS_GNUTLS} eq "y" || $config{HAS_OPENSSL} eq "y")
 	{
@@ -660,12 +661,12 @@ dumphash();
 
 if (($config{USE_GNUTLS} eq "y") && ($config{HAS_GNUTLS} ne "y"))
 {
-	print "Sorry, but I couldn't detect GnuTLS. Make sure gnutls-config is in your path.\n";
+	print "Sorry, but I couldn't detect GnuTLS. Make sure pkg-config is in your path.\n";
 	exit(0);
 }
 if (($config{USE_OPENSSL} eq "y") && ($config{HAS_OPENSSL} ne "y"))
 {
-	print "Sorry, but I couldn't detect OpenSSL. Make sure openssl is in your path.\n";
+	print "Sorry, but I couldn't detect OpenSSL. Make sure pkg-config and openssl are in your path.\n";
 	exit(0);
 }
 our $failed = 0;