CVS: is ChangeLog,1.9,1.10 Makefile.am,1.10,1.11 autogen.sh,1.4,1.5 configure.ac,1.10,1.11

Update of /cvsroot/intermezzo/is
In directory sc8-pr-cvs1:/tmp/cvs-serv1441

Modified Files:
	ChangeLog Makefile.am autogen.sh configure.ac 
Log Message:
Remove explicit dependancies on fs24


Index: ChangeLog
===================================================================
RCS file: /cvsroot/intermezzo/is/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- ChangeLog	5 Dec 2002 05:11:40 -0000	1.9
+++ ChangeLog	5 Dec 2002 05:39:45 -0000	1.10
@@ -5,4 +5,6 @@
 	if --with-linux supplied, and intelligently choose between
 	fs24 and fs25.
+	* autogen.sh: also generate autoconf scripts for fs25.
+	* Makefile.am: replace hardcoded fs24 stuff w/ @KERNDIR@.
 
 2002-05-19  Andres Salomon  <[email protected]>

Index: Makefile.am
===================================================================
RCS file: /cvsroot/intermezzo/is/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- Makefile.am	27 Sep 2002 00:43:16 -0000	1.10
+++ Makefile.am	5 Dec 2002 05:39:45 -0000	1.11
@@ -6,5 +6,5 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = fs24 lib utils doc intersync server packaging sampleconfigs
+SUBDIRS = @SUBDIRS@
 
 # We get the version from the intersync.spec file.
@@ -12,6 +12,6 @@
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure
 
-rpms: dist fs24/Makefile
-	rpm -ta --define "KVER `sed -ne '/RELEASE *= */{ s/.*= */-/; p; q; }' fs24/Makefile`" $(distdir).tar.gz
+rpms: dist @KERNDIR@/Makefile
+	rpm -ta --define "KVER `sed -ne '/RELEASE *= */{ s/.*= */-/; p; q; }' @KERNDIR@/Makefile`" $(distdir).tar.gz
 
 tags:

Index: autogen.sh
===================================================================
RCS file: /cvsroot/intermezzo/is/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- autogen.sh	11 Feb 2002 18:10:00 -0000	1.4
+++ autogen.sh	5 Dec 2002 05:39:45 -0000	1.5
@@ -4,3 +4,4 @@
 aclocal &&
 autoconf &&
-( cd fs24 && sh autogen.sh )
+( cd fs24 && sh autogen.sh ) &&
+( cd fs25 && sh autogen.sh )

Index: configure.ac
===================================================================
RCS file: /cvsroot/intermezzo/is/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- configure.ac	5 Dec 2002 05:11:40 -0000	1.10
+++ configure.ac	5 Dec 2002 05:39:45 -0000	1.11
@@ -112,4 +112,5 @@
 # Depending upon the kernel version, configure the right kernel module
 #
+SUBDIRS="lib utils doc intersync server packaging sampleconfigs"
 if test "$enable_linuxdir"; then
 	AC_MSG_CHECKING([for kernel version])
@@ -124,6 +125,11 @@
 		AC_MSG_ERROR([kernel version not supported!])
 	fi
-	AC_CONFIG_SUBDIRS(fs$kernel_version)
+	KERNDIR="fs$kernel_version"
+	AC_SUBST(KERNDIR)
+
+	AC_CONFIG_SUBDIRS($KERNDIR)
+	SUBDIRS="$SUBDIRS $KERNDIR"
 fi
+AC_SUBST(SUBDIRS)
 
 AC_OUTPUT(Makefile utils/Makefile lib/Makefile doc/Makefile \



-------------------------------------------------------
This SF.net email is sponsored by: Microsoft Visual Studio.NET 
comprehensive development tool, built to increase your 
productivity. Try a free online hosted session at:
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr0003en