From 1a5eb4f33af6f2f4501699121639499d36e9991e Mon Sep 17 00:00:00 2001
From: Vincent Carmona <vinc-mai@caramail.com>
Date: Tue, 12 Feb 2008 20:10:17 +0100
Subject: [PATCH] configure: exec-prefix

---
 configure     | 83 ++++++++++++++++++++++++++++++++++++-----------------------
 doc/ChangeLog |  4 ++-
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/configure b/configure
index 28bef2a..9e2fddc 100755
--- a/configure
+++ b/configure
@@ -2,8 +2,14 @@
 
 ERROR=0
 WARNING=0
-OPTION=0
-PREFIX=/usr/local
+OPTION=''
+DIR=`dirname $0`
+if test "X$DIR"="X."
+then
+	SED_FILE=config.sed
+else
+	SED_FILE=$DIR/config.sed
+fi
 
 #Help
 if test "X$1" = 'X--help'
@@ -12,6 +18,7 @@ then
 	echo -ne "configure --option1=value1 --option2=value2\n"
 	echo -ne "Valid options are:\n"
 	echo -ne "prefix -> Default is /usr/local\n"
+	echo -ne "exec-prefix -> Default is prefix\n"
 	echo -ne "That is all for now.\n"
 	exit 0
 fi
@@ -64,52 +71,64 @@ then
 fi
 
 #Parse the options
-if test -z "$1"
-then
-	OPTION=1
-fi
-
 until test -z "$1"
 do
 	case "$1" in
-		--prefix=*) PREFIX=`expr "$1" : '--prefix\=\(.*\)'`;;
-		--prefix*) PREFIX="$2";shift;;
+		--prefix=*) PREFIX=`expr "$1" : '--prefix\=\(.*\)'`;OPTION="$OPTION PREFIX";;
+		--prefix) PREFIX="$2";shift;OPTION="$OPTION PREFIX";;
+		--exec-prefix=*) EXEC_PREFIX=`expr "$1" : '--exec-prefix\=\(.*\)'`;OPTION="$OPTION EXEC_PREFIX";;
+		--exec-prefix) EXEC_PREFIX="$2";shift;OPTION="$OPTION EXEC_PREFIX";;
 		*) echo -ne "\nTry configure --help\nERROR:unknown options.\n\n";exit 1;;
 	esac
 	shift
 done
 
 #Check options
-path=`expr "$PREFIX" : '\/\(.*\)'`
-if test -z $path
-then
-	echo -ne "\nERROR:the prefix have to be an absolute path\n\n"
-	ERROR=1
-	exit 1
-fi
-path=`expr "$PREFIX" : '\(.*\)\/'`
-if test -n "$path"
-then
-	PREFIX=$path
-	echo -ne "\nWARNING:Prefix is set to $PREFIX.\n\n"
-	WARNING=1
-fi
+for i in $OPTION
+do
+	case $i in
+		PREFIX)
+			path=`expr "$PREFIX" : '\/\(.*\)'`
+			if test -z $path
+			then
+				echo -ne "\nERROR: prefix have to be an absolute path\n\n"
+				ERROR=1
+				exit 1
+			fi
+			path=`expr "$PREFIX" : '\(.*\)\/$'`
+			if test -n "$path"
+			then
+				PREFIX=$path
+				echo -ne "\nWARNING: prefix is set to $PREFIX.\n\n"
+				WARNING=1
+			fi;;
+		EXEC_PREFIX)
+			path=`expr "$EXEC_PREFIX" : '\/\(.*\)'`
+			if test -z $path
+			then
+				echo -ne "\nERROR: exec-prefix have to be an absolute path\n\n"
+				ERROR=1
+				exit 1
+			fi
+			path=`expr "$EXEC_PREFIX" : '\(.*\)\/$'`
+			if test -n "$path"
+			then
+				EXEC_PREFIX=$path
+				echo -ne "\nWARNING: exec-prefix is set to $EXEC_PREFIX.\n\n"
+				WARNING=1
+			fi;;
+	esac
+done
 
 #Write options to config.sed
-DIR=`dirname $0`
-if test "X$DIR"="X."
-then
-	SED_FILE=config.sed
-else
-	SED_FILE=$DIR/config.sed
-fi
 cat > $SED_FILE << CEOF
 s!PREFIX\=\/usr\/local!PREFIX\=$PREFIX!
+s!EXEC\_PREFIX\=\$(PREFIX)!EXEC\_PREFIX=$EXEC_PREFIX!
 CEOF
 
 #Create Makefile
 echo -ne "Creating Makefile.\n"
-if test "$OPTION" -eq 0
+if test -n "$OPTION"
 then
 	sed -f $SED_FILE $DIR/Makefile.in > $DIR/Makefile
 else
@@ -117,7 +136,7 @@ else
 fi
 
 #Exit
-echo -ne "Configuration done.\nThe Programm will be installed in $PREFIX\n"
+echo -ne "Configuration done.\nThe Programm will be installed in $PREFIX.\n"
 if test "$WARNING" -gt 0
 then
 	echo -ne "Warning(s) occured.\n"
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 439a9b9..98a6cd1 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,7 @@
+#Version 0.5.3
++Add configure script
 #Version 0.5.2
-++Change langauge in code for english. Use gettext for french translation.
+++Change language in code for english. Use gettext for french translation.
 ++Add search fonctions
 +Add the possibility to check the dependencies before installation.
 B- Fix occasional bug when deleting songs while playing.
-- 
2.11.4.GIT