|
From: Anton A. <an...@us...> - 2001-06-11 19:11:40
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv21600
Modified Files:
Makefile.am Makefile.in README configure configure.in
linux-ntfs.spec.in
Log Message:
Fix rpm generation.
Circumvent configure bug by cheating in configure.in moving around nonopt to
host and setting nonopt to NONE.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.am 2001/06/01 02:07:23 1.4
+++ Makefile.am 2001/06/11 19:11:37 1.5
@@ -10,5 +10,5 @@
EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.ntfsfix ChangeLog \
- INSTALL NEWS README autogen.sh linux-ntfs.spec.in
+ INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs
AUTOMAKE_OPTIONS = gnu
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.in 2001/06/11 04:02:08 1.4
+++ Makefile.in 2001/06/11 19:11:37 1.5
@@ -94,5 +94,5 @@
SUBDIRS = doc include libntfs ntfstools
-EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.ntfsfix ChangeLog INSTALL NEWS README autogen.sh linux-ntfs.spec.in
+EXTRA_DIST = AUTHORS CREDITS COPYING TODO.include TODO.ntfsfix ChangeLog INSTALL NEWS README autogen.sh linux-ntfs.spec.in TODO.mkntfs
Index: README
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- README 2001/06/10 18:30:16 1.3
+++ README 2001/06/11 19:11:37 1.4
@@ -59,5 +59,5 @@
rebooting into Windows NT/2000 or you *will* suffer! - You have been warned!
-mkntfs v1.22 - Format a partition with the NTFS filesystem. See man 8 mkntfs
+mkntfs v1.23 - Format a partition with the NTFS filesystem. See man 8 mkntfs
for command line options.
Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- configure 2001/06/11 04:02:08 1.6
+++ configure 2001/06/11 19:11:37 1.7
@@ -731,4 +731,9 @@
+if test "x$nonopt" != "xNONE"; then
+ host="$nonopt"
+ nonopt="NONE"
+fi
+
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -756,5 +761,5 @@
[...1020 lines suppressed...]
@@ -5969,10 +5974,10 @@
ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
echo $ac_n "checking for $ac_func... $ac_c" 1>&6
-echo "configure:5972: checking for $ac_func" 1>&5
+echo "configure:5977: checking for $ac_func" 1>&5
if eval "test \"\${$ac_ac_var+set}\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 5977 "configure"
+#line 5982 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
@@ -5998,5 +6003,5 @@
; return 0; }
EOF
-if { (eval echo configure:6001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "$ac_ac_var=yes"
Index: configure.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- configure.in 2001/06/11 04:02:08 1.6
+++ configure.in 2001/06/11 19:11:37 1.7
@@ -1,4 +1,14 @@
AC_INIT(aclocal.m4)
+dnl This is required to get past a stupid configure bug when making the rpm.
+dnl Basically it is broken to specify the host as a command line argument to
+dnl configure on its own, i.e. without giving --host=. It is supposed to work
+dnl but doesn't. So this sets host and erases nonopt effectively moving the
+dnl standalone command line option into the --host= form.
+if test "x$nonopt" != "xNONE"; then
+ host="$nonopt"
+ nonopt="NONE"
+fi
+
AC_CANONICAL_SYSTEM
Index: linux-ntfs.spec.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/linux-ntfs.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- linux-ntfs.spec.in 2001/06/10 18:30:16 1.4
+++ linux-ntfs.spec.in 2001/06/11 19:11:37 1.5
@@ -26,5 +26,5 @@
IMPORTANT: Run this only *after* unmounting the partition in Linux but *before*
rebooting into Windows NT/2000!
- mkntfs v1.22 - Format a partition with the NTFS filesystem. See man 8
+ mkntfs v1.23 - Format a partition with the NTFS filesystem. See man 8
mkntfs for command line options.
NtfsDump_LogFile v0.9 - Interpret and display information about the
@@ -46,5 +46,5 @@
%build
if [ -n "$LINGUAS" ]; then unset LINGUAS; fi
-%configure --prefix=%{prefix} --bindir=%{bindir}
+%configure
make
@@ -64,5 +64,5 @@
%{bindir}/*
%{mandir}/*/*
-%{prefix}/lib/*.so*
+# %{prefix}/lib/*.so*
@@ -74,4 +74,9 @@
%changelog
+* Mon Jun 11 2001 Anton Altaparmakov <ai...@ca...>
+- remove duplicate %configure options
+- remove shared library installation as shared libraries are disabled by
+default
+
* Sun Jun 10 2001 Anton Altaparmakov <ai...@ca...>
- add man pages stuff
|
