reverting r29771, duplicates Brian`s fix

This commit was SVN r29772.

The following SVN revision numbers were found above:
  r29771 --> open-mpi/ompi@bc25091b61

config/oshmem_configure_options.m4

@@ -24,22 +24,6 @@ AC_ARG_ENABLE([oshmem],
   [AC_HELP_STRING([--disable-oshmem],
      [Disable building the OpenSHMEM interface])])
 
-#
-# OSHMEM support
-#
-AC_MSG_CHECKING([if want OSHMEM support])
-AC_ARG_WITH([oshmem],
-    [AC_HELP_STRING([--with-oshmem],
-                    [Build with OSHMEM support (default=yes)])])
-if test "$with_oshmem" != "no"; then
-    AC_MSG_RESULT([yes])
-    oshmem_with_support=1
-else
-    AC_MSG_RESULT([no])
-    oshmem_with_support=0
-fi
-AM_CONDITIONAL(OSHMEM_SUPPORT, test "$oshmem_with_support" = 1)
-
 #
 # Enable compatibility mode
 #

oshmem/Makefile.am

@@ -9,9 +9,6 @@
 # $HEADER$
 #
 
-# Do we need to build OSHMEM?
-if OSHMEM_SUPPORT
-
 # Do we have profiling?
 if OSHMEM_PROFILING
 c_pshmem_lib = shmem/c/profile/liboshmem_c_pshmem.la
@@ -102,5 +99,3 @@ $(dir_stamp):
 # Remove the generated man pages
 distclean-local:
 	rm -f $(nodist_man_MANS) $(dir_stamp)
-
-endif # OSHMEM_SUPPORT