[Pvfs2-cvs] commit by pw in pvfs2: Makefile.in configure.in

CVS commit program cvs at parl.clemson.edu
Thu Jul 19 18:35:50 EDT 2007


Update of /projects/cvsroot/pvfs2
In directory parlweb1:/tmp/cvs-serv21547

Modified Files:
	Makefile.in configure.in 
Log Message:
Propagate separate build cflags and ldflags through configure.


Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/Makefile.in,v
diff -u -p -p -u -r1.247 -r1.248
--- Makefile.in	19 Jul 2007 22:33:12 -0000	1.247
+++ Makefile.in	19 Jul 2007 22:35:50 -0000	1.248
@@ -144,6 +144,8 @@ CC = @CC@
 LD = @CC@
 BUILD_CC = @BUILD_CC@
 BUILD_LD = @BUILD_CC@
+BUILD_CFLAGS = @BUILD_CFLAGS@
+BUILD_LDFLAGS = @BUILD_LDFLAGS@
 # make sure the srcdir include gets included first
 CFLAGS = -I$(srcdir)/include @CFLAGS@ @CPPFLAGS@
 LDFLAGS = -L at BUILD_ABSOLUTE_TOP@/lib
@@ -709,11 +711,11 @@ $(KERNAPPSTHR): %: %.o $(LIBRARIES_THREA
 # special rules to build state machine compiler using build host compiler
 $(STATECOMPOBJS): %.o: %.c
 	$(Q) "  BUILD_CC	$@"
-	$(E)$(BUILD_CC) $(CFLAGS) $< -c -o $@ $(call modcflags,$<)
+	$(E)$(BUILD_CC) $(BUILD_CFLAGS) $< -c -o $@ $(call modcflags,$<)
 
 $(STATECOMP): $(STATECOMPOBJS)
 	$(Q) "  BUILD_LD	$@"
-	$(E)$(BUILD_LD) -o $@ $(LDFLAGS) $(STATECOMPOBJS) $(call modldflags,$<)
+	$(E)$(BUILD_LD) -o $@ $(BUILD_LDFLAGS) $(STATECOMPOBJS) $(call modldflags,$<)
 
 # rule for generating cscope information
 cscope:

Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure.in,v
diff -u -p -p -u -r1.320 -r1.321
--- configure.in	19 Jul 2007 22:33:12 -0000	1.320
+++ configure.in	19 Jul 2007 22:35:50 -0000	1.321
@@ -71,12 +71,16 @@ AC_CHECK_PROG(HAVE_BISON, bison, yes, no
 AC_CHECK_PROG(HAVE_FLEX, flex, yes, no)
 
 if test $host != $build; then
-  AC_CHECK_PROGS(BUILD_CC, gcc cc)
+	AC_CHECK_PROGS(BUILD_CC, gcc cc)
 else
 	BUILD_CC=$CC
+	BUILD_CFLAGS=$BUILD_CFLAGS
+	BUILD_LDFLAGS=$BUILD_LDFLAGS
 fi
 
 AC_SUBST(BUILD_CC)
+AC_SUBST(BUILD_CFLAGS)
+AC_SUBST(BUILD_LDFLAGS)
 
 dnl a mechanism to turn off threads in the client library
 AC_MSG_CHECKING([for client library thread safety support])



More information about the Pvfs2-cvs mailing list