aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2001-01-25 01:28:18 +0000
committerNathan Scott <nathans@sgi.com>2001-01-25 01:28:18 +0000
commit1769c1bd6d99338432f29764777f1119ffb2455d (patch)
treeba139f12bb8004b241d6c36814c7fc984635495c
parentee0b5b8e73761ab74367012c44b01058a5a0ee89 (diff)
downloaddmapi-dev-1769c1bd6d99338432f29764777f1119ffb2455d.tar.gz
little out of date - sync up with other Makepkgs.
-rwxr-xr-xMakepkgs10
-rw-r--r--configure.in7
-rwxr-xr-xdebian/rules2
-rw-r--r--libdm/dm_handle2path.c1
4 files changed, 15 insertions, 5 deletions
diff --git a/Makepkgs b/Makepkgs
index 9f7bfa1..cf0e6d5 100755
--- a/Makepkgs
+++ b/Makepkgs
@@ -54,13 +54,15 @@ fi
SUDO=${SUDO:-sudo}
test ! -z "$SUDO" && sudo=$SUDO
if $debian ; then
- echo
- echo "== Debian build, log is $LOGDIR/debian"
+ LOGDEB=`pwd`
+ LOGDEB=../`basename $LOGDEB`.log
+ echo "== Debian build, log is $LOGDEB"; echo
if $verbose ; then
- exec dpkg-buildpackage -r$SUDO | tee $LOGDIR/debian
+ dpkg-buildpackage -r$SUDO | tee $LOGDEB
else
- exec dpkg-buildpackage -r$SUDO > $LOGDIR/debian
+ dpkg-buildpackage -r$SUDO > $LOGDEB
fi
+ exit 0
fi
echo
diff --git a/configure.in b/configure.in
index f982654..9004406 100644
--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,13 @@ test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo)
echo=$ECHO
AC_SUBST(echo)
+AC_CHECK_HEADER(xfs/handle.h,, [
+ echo
+ echo 'FATAL ERROR: could not find a valid XFS handle header.'
+ echo 'Install either the xfsprogs-devel (rpm) or the xfslibs-dev (deb) package.'
+ exit 1
+])
+
dnl alternate root and usr prefixes
test -z "$ROOT_PREFIX" && ROOT_PREFIX=""
diff --git a/debian/rules b/debian/rules
index 6159ab3..eeb38c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT;
pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
stdenv = GZIP=-q; export GZIP;
-options = DEBUG="-DNDEBUG"; OPTIMIZER="-O2 -g"; export DEBUG OPTIMIZER;
+options = DEBUG="-DNDEBUG"; OPTIMIZER="-O1 -g"; export DEBUG OPTIMIZER;
checkdir = test -f debian/rules
build: built
diff --git a/libdm/dm_handle2path.c b/libdm/dm_handle2path.c
index 52b92fe..2e3dde6 100644
--- a/libdm/dm_handle2path.c
+++ b/libdm/dm_handle2path.c
@@ -38,6 +38,7 @@
#include <string.h>
#include <unistd.h>
#ifdef linux
+#include <linux/types.h>
#include <linux/unistd.h>
#include <xfs/handle.h>
#include <asm/posix_types.h>