install clang/clang++ wrappers symlinks conditionally again

Luboš Luňák · Luboš Luňák · commit ef2ecba8db03 · 2013-01-08T00:04:21.000+01:00
The idea to make them unconditional is flawed, as it the clang->icerun symlink can be easily confused by the real compiler executable (e.g. in configure scripts checking for the specific compiler), but it doesn't work like one if the real compiler is not installed. Make them again optional, and add a configure option to force them. This reverts commit 5173304 and adds the option.
diff --git a/client/Makefile.am b/client/Makefile.am
@@ -29,14 +29,14 @@ install-exec-local:
 	$(LN_S) $(bindir)/icecc $(DESTDIR)$(bindir)/icerun
 
 	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)/bin
-	for link in g++ gcc c++ cc clang++ clang; do \
+	for link in g++ gcc c++ cc $(CLANG_SYMLINK_WRAPPERS); do \
 		rm -f $(DESTDIR)$(pkglibexecdir)/bin/$$link ;\
 		$(LN_S) $(bindir)/icecc $(DESTDIR)$(pkglibexecdir)/bin/$$link ;\
 	done
 
 uninstall-local:
 	rm $(DESTDIR)$(bindir)/icerun
 
-	for link in g++ gcc c++ cc clang++ clang; do \
+	for link in g++ gcc c++ cc $(CLANG_SYMLINK_WRAPPERS); do \
 		rm $(DESTDIR)$(pkglibexecdir)/bin/$$link ;\
 	done
diff --git a/configure.ac b/configure.ac
@@ -304,6 +304,23 @@ else
     fi
 fi
 
+AC_ARG_ENABLE(clang-wrappers,
+    AS_HELP_STRING([--enable-clang-wrappers],
+        [Use symlink wrappers for clang/clang++.]))
+
+CLANG_SYMLINK_WRAPPERS=
+if test "$enable_clang_wrappers" = "yes"; then
+    CLANG_SYMLINK_WRAPPERS='clang clang++'
+elif test "$enable_clang_wrappers" = "no"; then
+    true # do not enable
+else
+    AC_CHECK_PROG(CLANG,clang,clang)
+    if test -n "$CLANG"; then
+        CLANG_SYMLINK_WRAPPERS='clang clang++'
+    fi
+fi
+AC_SUBST(CLANG_SYMLINK_WRAPPERS)
+
 AC_CONFIG_FILES([ Makefile ])
 AC_CONFIG_FILES([ client/Makefile ])
 AC_CONFIG_FILES([ daemon/Makefile ])
