Tweak autogen a bit more

- lose hardcoded paths based on platform
- add --rpmconfigure that can be used if rpm is already present

1 files changed, 12 insertions, 26 deletions

diff --git a/autogen.sh b/autogen.sh
index e685f6477..b23f45817 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+export CPPFLAGS
 export CFLAGS
 export LDFLAGS
 
@@ -13,12 +14,6 @@ case $libtoolize in
     esac
 esac
 
-myopts=
-if [ X"$@" = X  -a "X`uname -s`" = "XDarwin" -a -d /opt/local ]; then
-    export myopts="--prefix=/usr --disable-nls"
-    export CPPFLAGS="-I${myprefix}/include"
-fi
-
 $libtoolize --copy --force
 autopoint --force
 aclocal
@@ -26,24 +21,15 @@ autoheader
 automake -a -c
 autoconf
 
-if [ "$1" = "--noconfigure" ]; then 
+case "$1" in
+  "--noconfigure")
     exit 0;
-fi
-
-if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    if [ -d /usr/share/man ]; then
-	mandir=/usr/share/man
-	infodir=/usr/share/info
-    else
-	mandir=/usr/man
-	infodir=/usr/info
-    fi
-    if [ -d /usr/lib/nptl ]; then
-	enable_posixmutexes="--enable-posixmutexes"
-    else
-	enable_posixmutexes=
-    fi
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} ${enable_posixmutexes} "$@"
-else
-    ./configure ${myopts} "$@"
-fi
+    ;;
+  "--rpmconfigure")
+    shift
+    eval "`rpm --eval %configure`" "$@"
+    ;;
+  *)
+    ./configure "$@"
+    ;;
+esac