>From 560ce8335169bba9d0a826ceca489a76ac8a30f6 Mon Sep 17 00:00:00 2001
From: Enrico Weigelt, metux IT service <weigelt@metux.de>
Date: Wed, 14 Jul 2010 18:59:55 +0200
Subject: [PATCH] configure: now accepting all gnu-style path options

---
 Makefile.in |    3 ++-
 configure   |   28 ++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5b15bd0..ab96c7e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,8 @@ exec_prefix = ${prefix}
 libdir = ${exec_prefix}/lib
 sharedlibdir = ${libdir}
 includedir = ${prefix}/include
-mandir = ${prefix}/share/man
+datadir    = ${prefix}/share
+mandir = ${datadir}/man
 man3dir = ${mandir}/man3
 pkgconfigdir = ${libdir}/pkgconfig
 
diff --git a/configure b/configure
index bd9edd2..16f838c 100755
--- a/configure
+++ b/configure
@@ -46,12 +46,6 @@ else
 fi
 LDCONFIG=${LDCONFIG-"ldconfig"}
 LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
-prefix=${prefix-/usr/local}
-exec_prefix=${exec_prefix-'${prefix}'}
-libdir=${libdir-'${exec_prefix}/lib'}
-sharedlibdir=${sharedlibdir-'${libdir}'}
-includedir=${includedir-'${prefix}/include'}
-mandir=${mandir-'${prefix}/share/man'}
 shared_ext='.so'
 shared=1
 zprefix=0
@@ -72,7 +66,17 @@ case "$1" in
     -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
     -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
     -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --libexecdir=*) libexecdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --bindir=*) bindir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --sbindir=*) sbindir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --sysconfdir=*) sysconfdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --localstatedir=*) localstatedir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --datadir=*) datadir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --infodir=*) infodir=`echo $1 | sed 's/.*=//'`; shift ;;
     --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --mandir=*) mandir=`echo $1 | sed 's/.*=//'`; shift ;;
+    --build=*) sys_build=`echo $1 | sed 's/.*=//'`; shift ;;
+    --host=*) sys_host=`echo $1 | sed 's/.*=//'`; shift ;;
     -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
     -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
     -p* | --prefix) prefix="$2"; shift; shift ;;
@@ -83,12 +87,18 @@ case "$1" in
     -t | --static) shared=0; shift ;;
     -z* | --zprefix) zprefix=1; shift ;;
     -6* | --64) build64=1; shift ;;
-    --sysconfdir=*) echo "ignored option: --sysconfdir"; shift ;;
-    --localstatedir=*) echo "ignored option: --localstatedir"; shift ;;
     *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1 ;;
     esac
 done
 
+prefix=${prefix-/usr/local}
+datadir=${datadir-'${prefix}/share'}
+mandir=${mandir-'${datadir}/man'}
+exec_prefix=${exec_prefix-'${prefix}'}
+libdir=${libdir-'${exec_prefix}/lib'}
+sharedlibdir=${sharedlibdir-'${libdir}'}
+includedir=${includedir-'${prefix}/include'}
+
 test=ztest$$
 cat > $test.c <<EOF
 extern int getchar();
@@ -568,6 +578,7 @@ sed < Makefile.in "
 /^sharedlibdir *=/s#=.*#=$sharedlibdir#
 /^includedir *=/s#=.*#=$includedir#
 /^mandir *=/s#=.*#=$mandir#
+/^datadir *=/s#=.*#=$datadir#
 /^all: */s#:.*#: $ALL#
 /^test: */s#:.*#: $TEST#
 " > Makefile
@@ -589,6 +600,7 @@ sed < zlib.pc.in "
 /^libdir *=/s#=.*#=$libdir#
 /^sharedlibdir *=/s#=.*#=$sharedlibdir#
 /^includedir *=/s#=.*#=$includedir#
+/^datadir *=/s#=.*#=$datadir#
 /^mandir *=/s#=.*#=$mandir#
 /^LDFLAGS *=/s#=.*#=$LDFLAGS#
 " | sed -e "
-- 
1.7.1