[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./autogen.sh ./configure ricci/make/defi ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2007-09-20 05:52:55

Modified files:
	.              : autogen.sh configure 
	ricci/make     : defines.mk.in 

Log message:
	Whitespace cleanup

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/configure.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/make/defines.mk.in.diff?cvsroot=cluster&r1=1.9&r2=1.10

--- conga/autogen.sh	2006/08/16 03:08:43	1.5
+++ conga/autogen.sh	2007/09/20 05:52:55	1.6
@@ -9,104 +9,100 @@
 INCLUDE_ZOPE_PLONE=""
 for arg in $@
 do
-  if [ "$arg" = "--include_zope_and_plone=yes" ] ; then
-      INCLUDE_ZOPE_PLONE="yes"
-  fi
-  if [ "$arg" = "--include_zope_and_plone=no" ] ; then
-      INCLUDE_ZOPE_PLONE="no"
-  fi
+	if [ "$arg" = "--include_zope_and_plone=yes" ] ; then
+		INCLUDE_ZOPE_PLONE="yes"
+	fi
+
+	if [ "$arg" = "--include_zope_and_plone=no" ] ; then
+		INCLUDE_ZOPE_PLONE="no"
+	fi
 done
+
 if [ "$INCLUDE_ZOPE_PLONE" = "" ] ; then
-    echo 'please define "include_zope_and_plone" as yes or no'
-    echo "(zope and plone are not used if building clustermon only)"
-    echo "    eg: $0 --include_zope_and_plone=yes" 
-    exit 1
+	echo 'please define "include_zope_and_plone" as yes or no'
+	echo "(zope and plone are not used if building clustermon only)"
+	echo " eg: $0 --include_zope_and_plone=yes" 
+	exit 1
 fi
 
-
-
-
 get_and_verify_archive()
 {
-    NAME=$1
-    MD5SUM=$2
-    shift 2
-    URLs=$@
-    
-    if [ ! -e $NAME ] ; then
-	echo ; echo "$NAME not present, download it"
-	done="false"
-	for url in $URLs
-	do
-	  if [ "$done" = "false" ] ; then
-	      echo "Downloading $NAME from $url"
-	      wget $url
-	      if [ "$?" = "0" ] ; then
-		  echo "$MD5SUM  $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
-		  if [ "$?" = "0" ] ; then
-		      echo "$NAME passed md5sum test"
-		      done="true"
-		  else
-		      echo "$NAME failed md5sum test"
-		      rm -f $NAME
-		      echo "Trying next mirror in the list..."
-		  fi
-	      else
-		  rm -f $NAME
-		  echo "Trying next mirror in the list..."
-	      fi
-	  fi
-	done
-	if [ "$done" = "false" ] ; then
-	    echo "No more mirrors to download $NAME from. exiting..."
-	    exit 5
-	fi
-    else
-	echo "$MD5SUM  $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
-	if [ "$?" = "0" ] ; then
-	    echo "$NAME passed md5sum test"
+	NAME=$1
+	MD5SUM=$2
+	shift 2
+	URLs=$@
+
+	if [ ! -e $NAME ] ; then
+		echo ; echo "$NAME not present, download it"
+		done="false"
+		for url in $URLs
+		do
+			if [ "$done" = "false" ] ; then
+				echo "Downloading $NAME from $url"
+				wget $url
+				if [ "$?" = "0" ] ; then
+					echo "$MD5SUM  $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
+					if [ "$?" = "0" ] ; then
+						echo "$NAME passed md5sum test"
+						done="true"
+					else
+						echo "$NAME failed md5sum test"
+						rm -f $NAME
+						echo "Trying next mirror in the list..."
+					fi
+				else
+					rm -f $NAME
+					echo "Trying next mirror in the list..."
+				fi
+			fi
+		done
+
+		if [ "$done" = "false" ] ; then
+			echo "No more mirrors to download $NAME from. exiting..."
+			exit 5
+		fi
 	else
-	    echo "$NAME failed md5sum test; remove it and try again"
-	    exit 6
+		echo "$MD5SUM  $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
+		if [ "$?" = "0" ] ; then
+			echo "$NAME passed md5sum test"
+		else
+			echo "$NAME failed md5sum test; remove it and try again"
+			exit 6
+		fi
 	fi
-    fi
 }
 
 if [ "$INCLUDE_ZOPE_PLONE" = "yes" ] ; then
-    get_and_verify_archive \
+	get_and_verify_archive \
 	$ZOPE_ARCHIVE_TAR \
 	$ZOPE_MD5SUM \
 	$ZOPE_URLs
-    get_and_verify_archive \
+	get_and_verify_archive \
 	$PLONE_ARCHIVE_TAR \
 	$PLONE_MD5SUM \
 	$PLONE_URLs
 fi
 
-
-
 . make/version.in
 
 cat conga.spec.in.in \
-    | sed -e s/@@VERS@@/$VERSION/g \
-    | sed -e s/@@REL@@/$RELEASE/g \
-    | sed -e s/@@INCLUDE_ZOPE_AND_PLONE@@/$INCLUDE_ZOPE_PLONE/g \
-    | sed -e s/@@ZOPE_ARCHIVE@@/$ZOPE_ARCHIVE/g \
-    | sed -e s/@@ZOPE_ARCHIVE_TAR@@/$ZOPE_ARCHIVE_TAR/g \
-    | sed -e s/@@PLONE_ARCHIVE@@/$PLONE_ARCHIVE/g \
-    | sed -e s/@@PLONE_ARCHIVE_TAR@@/$PLONE_ARCHIVE_TAR/g \
-    > conga.spec
+	| sed -e s/@@VERS@@/$VERSION/g \
+	| sed -e s/@@REL@@/$RELEASE/g \
+	| sed -e s/@@INCLUDE_ZOPE_AND_PLONE@@/$INCLUDE_ZOPE_PLONE/g \
+	| sed -e s/@@ZOPE_ARCHIVE@@/$ZOPE_ARCHIVE/g \
+	| sed -e s/@@ZOPE_ARCHIVE_TAR@@/$ZOPE_ARCHIVE_TAR/g \
+	| sed -e s/@@PLONE_ARCHIVE@@/$PLONE_ARCHIVE/g \
+	| sed -e s/@@PLONE_ARCHIVE_TAR@@/$PLONE_ARCHIVE_TAR/g \
+	> conga.spec
 
 cat clustermon.spec.in.in \
-    | sed -e s/@@VERS@@/$VERSION/g \
-    | sed -e s/@@REL@@/$RELEASE/g \
-    > clustermon.spec
-
+	| sed -e s/@@VERS@@/$VERSION/g \
+	| sed -e s/@@REL@@/$RELEASE/g \
+	> clustermon.spec
 
 cd ricci ; ./autogen.sh $@ ; cd ..
 cd luci ; ./autogen.sh $@ ; cd ..
 
-
 echo ""
 echo "Run \`./configure\` to configure conga build,"
 echo "or \`make srpms\` to build conga and clustermon srpms"
--- conga/configure	2006/08/09 20:53:21	1.4
+++ conga/configure	2007/09/20 05:52:55	1.5
@@ -5,17 +5,16 @@
 
 cd ricci ; ./configure $@ ; ret=$? ; cd ..
 if [ "$ret" != "0" ]; then
-    exit 1
+	exit 1
 fi
 
 cd luci ; ./configure $@ ; ret=$? ; cd ..
 if [ "$ret" != "0" ]; then
-    exit 2
+	exit 2
 fi
 
 echo "Run 'make' to compile conga and clustermon"
 echo "Run 'make conga' to compile conga"
 echo "Run 'make clustermon' to compile clustermon"
 
-
 exit 0
--- conga/ricci/make/defines.mk.in	2007/09/11 02:45:27	1.9
+++ conga/ricci/make/defines.mk.in	2007/09/20 05:52:55	1.10
@@ -1,51 +1,45 @@
-
 # default params:
-program-prefix ?=
-prefix         ?= ${DESTDIR}/usr
-exec-prefix    ?= ${DESTDIR}/usr
-bindir         ?= ${exec-prefix}/bin
-sbindir        ?= ${exec-prefix}/sbin
-sysconfdir     ?= ${DESTDIR}/etc
-datadir        ?= ${prefix}/share
-includedir     ?= ${prefix}/include
-libdir         ?= ${prefix}@@LIBDIR@@
-libexecdir     ?= ${prefix}/libexec
-localstatedir  ?= ${DESTDIR}/var
-sharedstatedir ?= ${prefix}/com
-mandir         ?= ${datadir}/man
-infodir        ?= ${datadir}/info
-docdir         ?= ${datadir}/doc
-arch           ?= @@ARCH@@
-pegasus_providers_dir ?= ${libdir}/Pegasus/providers
-dbus_version          ?= @@DBUS_VERSION@@
-dbus_major_version    ?= @@DBUS_MAJOR_VERSION@@
-dbus_minor_version    ?= @@DBUS_MINOR_VERSION@@
-
-
-#--build=i686-redhat-linux-gnu
-#--host=i686-redhat-linux-gnu
-#--target=i386-redhat-linux-gnu
-
-
-INSTALL_DIR  = install -d
-INSTALL_FILE = install -m 644
-INSTALL_BIN  = install
-INSTALL_LIB  = install
+program-prefix	?=
+prefix			?= ${DESTDIR}/usr
+exec-prefix		?= ${DESTDIR}/usr
+bindir			?= ${exec-prefix}/bin
+sbindir			?= ${exec-prefix}/sbin
+sysconfdir		?= ${DESTDIR}/etc
+datadir			?= ${prefix}/share
+includedir		?= ${prefix}/include
+libdir			?= ${prefix}@@LIBDIR@@
+libexecdir		?= ${prefix}/libexec
+localstatedir	?= ${DESTDIR}/var
+sharedstatedir	?= ${prefix}/com
+mandir			?= ${datadir}/man
+infodir			?= ${datadir}/info
+docdir			?= ${datadir}/doc
+arch			?= @@ARCH@@
+pegasus_providers_dir	?= ${libdir}/Pegasus/providers
+dbus_version			?= @@DBUS_VERSION@@
+dbus_major_version		?= @@DBUS_MAJOR_VERSION@@
+dbus_minor_version		?= @@DBUS_MINOR_VERSION@@
+
+
+INSTALL_DIR		= install -d
+INSTALL_FILE	= install -m 644
+INSTALL_BIN		= install
+INSTALL_LIB		= install
 
 PARANOID=0
-PEGASUS_PLATFORM  ?= @@PEGASUS_PLATFORM@@
+PEGASUS_PLATFORM ?= @@PEGASUS_PLATFORM@@
 
-INCLUDE         += -I $(top_srcdir)/include \
-			`pkg-config --cflags libxml-2.0` \
-			`pkg-config --cflags openssl`
-CFLAGS          += -Wall -Wno-unused -fPIC -O2 -g ${INCLUDE}
-CXXFLAGS        += -Wall -Wno-unused -fPIC -O2 -g ${INCLUDE}
-LDFLAGS         += -fPIC -lpthread \
-			`pkg-config --libs libxml-2.0` \
-			`pkg-config --libs openssl`
-
-CC              = gcc
-CXX             = g++
-LD              = g++
-RANLIB          ?= ranlib
+INCLUDE			+= -I $(top_srcdir)/include \
+					`pkg-config --cflags libxml-2.0` \
+					`pkg-config --cflags openssl`
+CFLAGS			+= -Wall -Wno-unused -fPIC -O2 -g ${INCLUDE}
+CXXFLAGS		+= -Wall -Wno-unused -fPIC -O2 -g ${INCLUDE}
+LDFLAGS			+= -fPIC -lpthread \
+					`pkg-config --libs libxml-2.0` \
+					`pkg-config --libs openssl`
+
+CC				= gcc
+CXX				= g++
+LD				= g++
+RANLIB			?= ranlib
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]