Remove now-outdated --enable-rpm configure option

Author: d-torrance

M2/configure.ac

@@ -161,7 +161,6 @@ AC_CHECK_PROGS(ETAGS,etags ctags,false)
 if test "$ETAGS" = false; then AC_MSG_WARN(without etags no TAGS files will be made); fi
 AC_CHECK_PROGS(LINTIAN,lintian,false)
 AC_CHECK_PROGS(OTOOL,otool,false)
-AC_CHECK_PROGS(RPMLINT,rpmlint,false)
 AC_CHECK_PROGS(TAR,gtar gnutar tar,false)
 AC_CHECK_PROGS(FIND,gfind find,false)
 AC_CHECK_PROGS(OBJDUMP,objdump,false)
@@ -531,17 +530,6 @@ then if test "$OPTIMIZE" = no
      fi
 fi
 
-AC_SUBST(RPM,no)
-AC_ARG_ENABLE(rpm,  AS_HELP_STRING(--enable-rpm,prepare a *.rpm package (for red hat based systems)), RPM=$enableval)
-if test "$RPM" = yes 
-then if test "$OPTIMIZE" = no
-     then AC_MSG_ERROR([--disable-optimize and --enable-rpm both specified])
-     fi
-     if test "$DEBUG" = yes
-     then AC_MSG_ERROR([--enable-debug and --enable-rpm both specified])
-     fi
-fi
-
 AC_SUBST(DMG,no)
 AC_ARG_ENABLE(dmg,  AS_HELP_STRING(--enable-dmg,prepare a *.dmg package (for Mac OS)), DMG=$enableval)
 if test "$DMG" = yes 
@@ -1970,8 +1958,6 @@ test "$prefix" || prefix=/usr/local
 # for some distributions, we know what the prefix should be:
 test "$DEB"     = yes && test "$prefix" != /usr && 
      AC_MSG_ERROR(--enable-deb specified and --prefix not set to /usr)
-test "$RPM"     = yes && test "$prefix" != /usr && 
-     AC_MSG_ERROR(--enable-rpm specified and --prefix not set to /usr)
 
 if test "$prefix" != /usr/local
 then test "$FREEBSD" = yes && AC_MSG_ERROR(--enable-freebsd specified and --prefix not set to /usr/local)

M2/distributions/Makefile.in

@@ -3,7 +3,7 @@ include ../include/config.Makefile
 VPATH = @srcdir@
 all:
 .PHONY: all
-$(foreach d,top tar deb freebsd rpm dmg,	\
+$(foreach d,top tar deb freebsd dmg,		\
 	$(eval .PHONY: all-in-$d)		\
 	$(eval all-in-$d:; + $(MAKE) -C $d all))
 ifeq "@M2TARFILE@" "yes"
@@ -17,14 +17,11 @@ endif
 ifeq "@FREEBSD@" "yes"
 all: all-in-freebsd
 endif
-ifeq "@RPM@" "yes"
-all: all-in-rpm
-endif
 ifeq "@DMG@" "yes"
 all: all-in-dmg
 endif
 $(foreach t,clean distclean,						\
-   $(foreach d,dmg rpm deb freebsd tar top install, $(eval	\
+   $(foreach d,dmg deb freebsd tar top install, $(eval			\
       .PHONY: $t $t-in-$d						\
 						          )$(eval	\
       $t: $t-in-$d							\

M2/distributions/rpm/Macaulay2-body.spec.in

@@ -78,8 +78,6 @@ PATH_SEPARATOR=@PATH_SEPARATOR@
 PROFILING=@PROFILING@
 RANLIB=@RANLIB@
 REL=@REL@
-RPM=@RPM@
-RPMLINT=@RPMLINT@
 SHARED=@SHARED@
 SHELL=@SHELL@
 ENABLE_STRIP=@ENABLE_STRIP@

M2/distributions/rpm/Macaulay2-common-body.spec.in

@@ -10,9 +10,6 @@ distributions/top/preremove
 distributions/top/postinstall
 distributions/tar/Makefile
 distributions/dmg/Makefile
-distributions/rpm/Makefile
-distributions/rpm/Macaulay2-body.spec
-distributions/rpm/Macaulay2-common-body.spec
 distributions/freebsd/Makefile
 distributions/freebsd/post-install
 distributions/freebsd/post-deinstall