Fix for bug 4855. Packaging info for m4 on Linux.

allmakefiles.sh

@@ -47,6 +47,8 @@ base/src/motif/Makefile
 base/src/rhapsody/Makefile
 base/src/gtk/Makefile
 base/tests/Makefile
+build/package/rpm/mozilla.spec
+build/package/rpm/nspr-pthreads.spec
 config/Makefile
 config/autoconf.mk
 config/mkdepend/Makefile

build/package/rpm/mozilla.spec.in

@@ -0,0 +1,98 @@
+%define ver		@MOZILLA_RPM_VERSION@
+%define rel		@MOZILLA_RPM_RELEASE@
+%define prefix	@MOZILLA_RPM_PREFIX@
+%define tmp		@MOZILLA_RPM_TMP@
+
+Summary:	Mozilla / ButtMonkey / Gecko / Whatever
+Name:		mozilla
+Version:	%ver
+Release:	%rel
+Copyright:	NPL
+Group:		Mozilla
+Source:		mozilla-%{ver}-%{rel}.tar.gz
+BuildRoot:	%{tmp}/%{name}-root
+Packager:	Ramiro Estrugo <ramiro@netscape.com>
+URL:		http://www.mozilla.org/
+Provides:	mozilla
+Requires:	glib >= 1.2.1 gtk+ >= 1.2.1 nspr-pthreads >= 3.1
+
+%description
+Mozilla
+
+%package devel
+Summary:	Mozilla development crap
+Group:		Mozilla
+#Requires:	mozilla nspr-devel
+
+#Obsoletes: libnspr-devel
+#Conflicts: libnspr-userthreads-devel
+
+%description devel
+Mozilla development libs and headers
+
+%prep
+%setup -n mozilla
+
+%build
+./configure \
+			--with-pthreads \
+			--enable-toolkit=gtk \
+			--disable-build-nspr \
+			@MOZILLA_RPM_SEAMONKEY_OPTIMIZE@
+
+make
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+mkdir -p $RPM_BUILD_ROOT%{prefix}/include/mozilla
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+
+cp -rpv dist/bin/components/*.so $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
+cp -rpv dist/bin/res/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
+cp -rpv dist/bin/*.so $RPM_BUILD_ROOT%{prefix}/lib
+cp -rpv dist/include/* $RPM_BUILD_ROOT%{prefix}/include/mozilla
+cp -rpv dist/idl/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
+cp -rpv dist/lib/*.a $RPM_BUILD_ROOT%{prefix}/lib
+cp -rpv dist/bin/apprunner $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+cp -rpv dist/bin/viewer $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+cp -rpv dist/bin/vreg $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+
+cp -rpv build/mozilla-viewer.sh $RPM_BUILD_ROOT/usr/bin/mozilla-viewer
+cp -rpv build/mozilla-apprunner.sh $RPM_BUILD_ROOT/usr/bin/mozilla-apprunner
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+
+#if grep "/usr/mozilla/lib" /etc/ld.so.conf > /dev/null 2>&1
+#then
+#	:
+#else
+#	echo "/usr/mozilla/lib" >> /etc/ld.so.conf
+#fi
+#
+#/sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%attr(-, root, root)
+
+%{prefix}/lib/mozilla/components/*
+%{prefix}/lib/*.so
+%{prefix}/lib/mozilla/bin/*
+%{prefix}/lib/mozilla/res/*
+%attr(755, root, root)/usr/bin/mozilla-viewer
+%attr(755, root, root)/usr/bin/mozilla-apprunner
+
+%files devel
+%attr(-, root, root)
+
+%{prefix}/lib/*.a
+%{prefix}/include/mozilla/*
+%{prefix}/lib/mozilla/idl/*

configure.in

@@ -1559,6 +1559,29 @@ for lib_arg in $NSPR_LIBS $TK_LIBS; do
 done
 AC_SUBST(LIBS_PATH)
 
+dnl rpm support
+dnl ========================================================
+AC_DEFINE(MOZILLA_RPM_NSPR_OPTIMIZE)
+AC_DEFINE(MOZILLA_RPM_PREFIX)
+AC_DEFINE(MOZILLA_RPM_RELEASE)
+AC_DEFINE(MOZILLA_RPM_SEAMONKEY_OPTIMIZE)
+AC_DEFINE(MOZILLA_RPM_TMP)
+AC_DEFINE(MOZILLA_RPM_VERSION)
+
+MOZILLA_RPM_NSPR_OPTIMIZE="BUILD_OPT=1"
+MOZILLA_RPM_PREFIX="/usr"
+MOZILLA_RPM_RELEASE="SeaMonkey_M4_BRANCH_19990409"
+MOZILLA_RPM_SEAMONKEY_OPTIMIZE="--disable-debug"
+MOZILLA_RPM_TMP="/tmp"
+MOZILLA_RPM_VERSION="5.0"
+
+AC_SUBST(MOZILLA_RPM_NSPR_OPTIMIZE)
+AC_SUBST(MOZILLA_RPM_PREFIX)
+AC_SUBST(MOZILLA_RPM_RELEASE)
+AC_SUBST(MOZILLA_RPM_SEAMONKEY_OPTIMIZE)
+AC_SUBST(MOZILLA_RPM_TMP)
+AC_SUBST(MOZILLA_RPM_VERSION)
+
 dnl Spit out some output
 dnl ========================================================