Change in vdsm[master]: autogen.sh: deprecate --system

dougsland at redhat.com dougsland at redhat.com
Mon Mar 17 17:23:57 UTC 2014


Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: autogen.sh: deprecate --system
......................................................................

autogen.sh: deprecate --system

The original goal for autogen.sh script is generate the scripts to build the
project and not run it. However, we provide graciously to users the option
--system that sets prefix=/usr, libdir=$prefix/lib (or lib64), sysconfdir=/etc
and localstatedir=/var. The problem is that users must know that --system exist
if they run without this option the build might contain paths like:
/usr/local/var/log/vdsm instead of /var/log/vdsm. Another point, if users
want to run autogen.sh is because they want to set automatic the options,
otherwise they would run ./configure manually with all options they want.
This patch keeps the current behavior of autogen.sh, but sets the options
mentioned above even if the user does not provide the --system option.

Change-Id: I74bf8971339a242aa5475a7efbbf4f40051ef293
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M autogen.sh
1 file changed, 36 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/25804/1

diff --git a/autogen.sh b/autogen.sh
index 2f5b499..6f7b106 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,30 +1,48 @@
 #!/bin/sh
+#
+# Copyright 2009-2014 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Refer to the README and COPYING files for full details of the license
+#
 
 autoreconf -if
 
+prefix=/usr
+libdir=$prefix/lib
+sysconfdir=/etc
+localstatedir=/var
+if [ -d /usr/lib64 ]; then
+  libdir=$prefix/lib64
+fi
+
 if test "x$1" = "x--system"; then
+    echo "Please note: --system is deprecated!"
     shift
-    prefix=/usr
-    libdir=$prefix/lib
-    sysconfdir=/etc
-    localstatedir=/var
-    if [ -d /usr/lib64 ]; then
-      libdir=$prefix/lib64
-    fi
-    EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir"
-    echo "Running ./configure with $EXTRA_ARGS $@"
-else
-    if test -z "$*" && test ! -f "$THEDIR/config.status"; then
-        echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-    fi
 fi
 
 if test -z "$*" && test -f config.status; then
     ./config.status --recheck
 else
+    EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir"
+    echo "Running ./configure with $EXTRA_ARGS $@"
     ./configure $EXTRA_ARGS "$@"
-fi && {
-    echo
-    echo "Now type 'make' to compile vdsm."
-}
+fi
+
+echo
+echo "Additional commands:"
+echo "type 'make' to compile vdsm."
+echo "type 'make rpm' to generate vdsm rpms"


-- 
To view, visit http://gerrit.ovirt.org/25804
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74bf8971339a242aa5475a7efbbf4f40051ef293
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>


More information about the vdsm-patches mailing list