[PVFS2-CVS] commit by slang in pvfs2/test: Makefile.in configure.in
CVS commit program
cvs at parl.clemson.edu
Thu Aug 25 17:38:43 EDT 2005
Update of /projects/cvsroot/pvfs2/test
In directory parlweb:/tmp/cvs-serv7520/test
Modified Files:
Tag: slang-event-changes-branch
Makefile.in configure.in
Log Message:
updates to my event changes to bring them inline with trunk
Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/Makefile.in,v
diff -p -u -r1.8 -r1.8.2.1
--- Makefile.in 30 Mar 2005 15:43:28 -0000 1.8
+++ Makefile.in 25 Aug 2005 20:38:42 -0000 1.8.2.1
@@ -367,9 +367,9 @@ $(KARMADEPENDS): %.d: %.c
$(E)$(pvfs2_srcdir)/maint/depend.sh $(call dirname,$*) $(CFLAGS) $(call modcflags,$<) $< > $@
install::
- install -d @PVFS2_TOP_PREFIX@/bin
- install -m 755 $(TESTS) @PVFS2_TOP_PREFIX@/bin
+ install -d @PVFS2_TOP_PREFIX@/test
+ install -m 755 $(TESTS) @PVFS2_TOP_PREFIX@/test
ifdef BUILD_MPI
- install -m 755 $(MPITESTS) @PVFS2_TOP_PREFIX@/bin
- install -m 755 $(MPIIOTESTS) @PVFS2_TOP_PREFIX@/bin
+ install -m 755 $(MPITESTS) @PVFS2_TOP_PREFIX@/test
+ install -m 755 $(MPIIOTESTS) @PVFS2_TOP_PREFIX@/test
endif
Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/test/configure.in,v
diff -p -u -r1.4 -r1.4.6.1
--- configure.in 3 Dec 2004 15:13:31 -0000 1.4
+++ configure.in 25 Aug 2005 20:38:43 -0000 1.4.6.1
@@ -34,7 +34,22 @@ AC_SUBST(QUIET_COMPILE)
dnl Check for utilities that we need during the build process
AC_PROG_INSTALL
+
+USR_CFLAGS=$CFLAGS
AC_PROG_CC
+
+AC_MSG_CHECKING(whether cc is gcc)
+if test "x$GCC" = "x"; then
+ AC_MSG_ERROR(pvfs2 currently requires gcc as the compiler)
+fi
+CFLAGS=$USR_CFLAGS
+
+if test "x$USR_CFLAGS" = "x"; then
+ USR_CFLAGS_SET=no
+else
+ USR_CFLAGS_SET=yes
+fi
+
AC_PROG_CPP
AC_CHECK_PROG(HAVE_PERL, perl, yes, no)
AC_CHECK_PROG(HAVE_FIND, find, yes, no)
@@ -80,6 +95,8 @@ AC_ARG_WITH(mpi,
AC_MSG_ERROR(--with-mpi must be given a pathname)
else
MPICC="${withval}/bin/mpicc"
+ CFLAGS="${CFLAGS} -I${withval}/include"
+ LDFLAGS="${LDFLAGS} -L${withval}/lib"
BUILD_MPI="1"
fi
)
@@ -108,6 +125,19 @@ AC_ARG_WITH(pvfs2-build,
)
AC_SUBST(PVFS2_SRC_RELATIVE_TOP)
AC_SUBST(PVFS2_BUILD_RELATIVE_TOP)
+
+AC_ARG_ENABLE(strict,
+[ --enable-strict Turn on strict debugging with gcc],
+[
+if test "x$USR_CFLAGS_SET" = "xno"; then
+ CFLAGS="$CFLAGS -g -Wall -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wpointer-arith -Wbad-function-cast"
+fi
+],
+[
+if test "x$USR_CFLAGS_SET" = "xno"; then
+ CFLAGS="$CFLAGS -g -O2"
+fi
+])
LDFLAGS="${LDFLAGS} -L${PVFS2_BUILD_RELATIVE_TOP}/lib"
CFLAGS="${CFLAGS} -I${PVFS2_SRC_RELATIVE_TOP} -I${PVFS2_SRC_RELATIVE_TOP}/include -I${PVFS2_BUILD_RELATIVE_TOP}"
More information about the PVFS2-CVS
mailing list