r3238 - trunk/varnish-cache

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2008-09-29 12:52:34 +0200 (Mon, 29 Sep 2008)
New Revision: 3238

Modified:
   trunk/varnish-cache/configure.ac
Log:
Merge branch 'cflags_for_vcl'


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2008-09-29 10:49:12 UTC (rev 3237)
+++ trunk/varnish-cache/configure.ac	2008-09-29 10:52:34 UTC (rev 3238)
@@ -326,18 +326,22 @@
 # Command line for compiling VCL code.  I wish there were a simple way
 # to figure this out dynamically without introducing a run-time
 # dependency on libtool.
-case $host in
-*-*-solaris*)
-	VCC_CC="cc -Kpic ${CFLAGS} -G -o %o %s"
-	;;
-*-*-darwin*)
-	VCC_CC="exec cc -dynamiclib -Wl,-undefined,dynamic_lookup ${CFLAGS} -o %o %s"
-	;;
-*)
-	VCC_CC="exec cc -fpic -shared -Wl,-x ${CFLAGS} -o %o %s"
-	;;
-esac
-
+AC_ARG_VAR([VCC_CC], [C compiler command line for VCL code])
+if test "$ac_cv_env_VCC_CC_set" = "set"; then
+	VCC_CC="$ac_cv_env_VCC_CC_value"
+else
+	case $host in
+	*-*-solaris*)
+		VCC_CC="cc -Kpic -G -o %o %s"
+		;;
+	*-*-darwin*)
+		VCC_CC="exec cc -dynamiclib -Wl,-undefined,dynamic_lookup -o %o %s"
+		;;
+	*)
+		VCC_CC="exec cc -fpic -shared -Wl,-x -o %o %s"
+		;;
+	esac
+fi
 AC_DEFINE_UNQUOTED([VCC_CC],"$VCC_CC",[C compiler command line for VCL code])
 
 # Use jemalloc on Linux