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

CVS commit program cvs at parl.clemson.edu
Sun Jul 22 12:02:16 EDT 2007


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

Modified Files:
	Makefile.in configure configure.in 
Log Message:
Keep bmi-tcp epoll issue out of global cflags.


Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/Makefile.in,v
diff -u -p -p -u -r1.253 -r1.254
--- Makefile.in	22 Jul 2007 15:48:51 -0000	1.253
+++ Makefile.in	22 Jul 2007 16:02:14 -0000	1.254
@@ -71,7 +71,6 @@ BUILD_OPENIB = @BUILD_OPENIB@
 BUILD_PORTALS = @BUILD_PORTALS@
 BUILD_VIS = @BUILD_VIS@
 BUILD_KARMA = @BUILD_KARMA@
-BUILD_EPOLL = @BUILD_EPOLL@
 BUILD_SERVER = @BUILD_SERVER@
 NEEDS_LIBRT = @NEEDS_LIBRT@
 TARGET_OS_DARWIN = @TARGET_OS_DARWIN@

Index: configure
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure,v
diff -u -p -p -u -r1.349 -r1.350
--- configure	22 Jul 2007 15:48:51 -0000	1.349
+++ configure	22 Jul 2007 16:02:14 -0000	1.350
@@ -11374,7 +11374,6 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
        $as_test_x conftest$ac_exeext; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-     CFLAGS="$CFLAGS -D__PVFS2_USE_EPOLL__"
      BUILD_EPOLL=1
 
 else
@@ -11394,7 +11393,6 @@ rm -f core conftest.err conftest.$ac_obj
 if test "${enable_epoll+set}" = set; then
   enableval=$enable_epoll;
    if test "x$enableval" = "xyes"; then
-        CFLAGS="$CFLAGS -D__PVFS2_USE_EPOLL__"
         BUILD_EPOLL=1
 
    fi

Index: configure.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/configure.in,v
diff -u -p -p -u -r1.325 -r1.326
--- configure.in	22 Jul 2007 15:48:51 -0000	1.325
+++ configure.in	22 Jul 2007 16:02:16 -0000	1.326
@@ -584,7 +584,6 @@ test_for_epoll()
 	close(fd);
   ],
      AC_MSG_RESULT(yes)
-     CFLAGS="$CFLAGS -D__PVFS2_USE_EPOLL__"
      BUILD_EPOLL=1
      AC_SUBST(BUILD_EPOLL),
      AC_MSG_RESULT(no)
@@ -600,7 +599,6 @@ AC_ARG_ENABLE(epoll,
   --disable-epoll         Disable epoll, use poll instead],
 [
    if test "x$enableval" = "xyes"; then
-        CFLAGS="$CFLAGS -D__PVFS2_USE_EPOLL__"
         BUILD_EPOLL=1
         AC_SUBST(BUILD_EPOLL)
    fi



More information about the Pvfs2-cvs mailing list