Make sure that if an exec() macro fails its picked up before build time

[user/henk/code/inspircd.git] / configure

diff --git a/configure b/configure
index 5c23eb02f3cdd5562cff2c211a9d6c5a82fd1feb..dab2a6a9d89570353d41b9ba74b41d34f58e7407 100755 (executable)
--- a/configure
+++ b/configure
@@ -1287,25 +1287,25 @@ EOF
                        close(FILEHANDLE);
 
                        print "Writing \033[1;32m$file\033[0m ...\n";
-                       $tmp =~ s/\@CC\@/$config{CC}/;
-                       $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/;
-                       $tmp =~ s/\@FLAGS\@/$config{FLAGS}/;
-                       $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/;
-                       $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/;
-                       $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/;
-                       $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/;
-                       $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/;
-                       $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/;
-                       $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/;
-                       $tmp =~ s/\@MODULES\@/$modules/;
+                       $tmp =~ s/\@CC\@/$config{CC}/ if defined $config{CC};
+                       $tmp =~ s/\@MAKEPROG\@/$config{MAKEPROG}/ if defined $config{MAKEPROG};
+                       $tmp =~ s/\@FLAGS\@/$config{FLAGS}/ if defined $config{FLAGS};
+                       $tmp =~ s/\@DEVELOPER\@/$config{DEVELOPER}/ if defined $config{DEVELOPER};
+                       $tmp =~ s/\@LDLIBS\@/$config{LDLIBS}/ if defined $config{LDLIBS};
+                       $tmp =~ s/\@BASE_DIR\@/$config{BASE_DIR}/ if defined $config{BASE_DIR};
+                       $tmp =~ s/\@CONFIG_DIR\@/$config{CONFIG_DIR}/ if defined $config{CONFIG_DIR};
+                       $tmp =~ s/\@MODULE_DIR\@/$config{MODULE_DIR}/ if defined $config{MODULE_DIR};
+                       $tmp =~ s/\@BINARY_DIR\@/$config{BINARY_DIR}/ if defined $config{BINARY_DIR};
+                       $tmp =~ s/\@LIBRARY_DIR\@/$config{LIBRARY_DIR}/ if defined $config{LIBRARY_DIR};
+                       $tmp =~ s/\@MODULES\@/$modules/ if defined $modules;
                        $tmp =~ s/\@STARTSCRIPT\@/$config{STARTSCRIPT}/ if defined $config{STARTSCRIPT};
                        $tmp =~ s/\@DESTINATION\@/$config{DESTINATION}/ if defined $config{DESTINATION};
                        $tmp =~ s/\@EXTRA_DIR\@/$config{EXTRA_DIR}/ if defined $config{EXTRA_DIR};
-                       $tmp =~ s/\@EXECUTABLE\@/$exe/;
-                       $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
-                       $tmp =~ s/\@VERSION\@/$version/;
-                       $tmp =~ s/\@INSTALL_LIST\@/$install_list/;
-                       $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/;
+                       $tmp =~ s/\@EXECUTABLE\@/$exe/ if defined $exe;
+                       $tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/ if defined $config{MAKEORDER};
+                       $tmp =~ s/\@VERSION\@/$version/ if defined $version;
+                       $tmp =~ s/\@INSTALL_LIST\@/$install_list/ if defined $install_list;
+                       $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/ if defined $uninstall_list;
 
                        open(FILEHANDLE, ">$file");
                        print FILEHANDLE $tmp;