msm: consistency for equally ranked keys

[platform/upstream/rpm.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index e635515..f7ea2cf 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,45 +1,20 @@
 #!/bin/sh
 
+export CPPFLAGS
 export CFLAGS
 export LDFLAGS
 
-LTV="libtoolize (GNU libtool) 1.4"
-ACV="Autoconf version 2.13"
-AMV="automake (GNU automake) 1.4-p4"
-USAGE="
-This script documents the versions of the tools I'm using to build rpm:
-       libtool-1.4
-       autoconf-2.13
-       automake-1.4-p4
-Simply edit this script to change the libtool/autoconf/automake versions
-checked if you need to, as rpm should build (and has built) with all
-recent versions of libtool/autoconf/automake.
-"
+autoreconf -i
 
-[ "`libtoolize --version`" != "$LTV" ] && echo "$USAGE" && exit 1
-[ "`autoconf --version`" != "$ACV" ] && echo "$USAGE" && exit 1
-[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1
-
-(cd popt; ./autogen.sh --noconfigure "$@")
-libtoolize --copy --force
-aclocal
-autoheader
-automake
-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
-    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} "$@"
-else
+    ;;
+  "--rpmconfigure")
+    shift
+    eval "`rpm --eval %configure`" "$@"
+    ;;
+  *)
     ./configure "$@"
-fi
+    ;;
+esac