Makefile.in, configure.in, ChangeLog, configure:
Makefile.in: Move the generated types.h file from the linux/ directory
to the asm/ directory.
configure.in: Force Solaris to never use -static, due to its dynamic
loader not being available to statically linked programs. Create the
asm/ directory if needed.
.del-types.h.in~ca55114a, .del-ext2_fs.h~7a460879, .del-types.h.in~7a460879:
Move the types.h header file from linux/ to asm/.
diff --git a/configure.in b/configure.in
index 63609f6..6256b35 100644
--- a/configure.in
+++ b/configure.in
@@ -488,6 +488,18 @@
AC_TRY_LINK([#include <stdio.h>],[fflush(stdout);],
ac_cv_e2fsprogs_use_static=yes, ac_cv_e2fsprogs_use_static=no)
LDFLAGS=$SAVE_LDFLAGS])
+dnl
+dnl Regardless of how the test turns out, Solaris doesn't handle -static
+dnl This is caused by the socket library requiring the nsl library, which
+dnl requires the -dl library, which only works for dynamically linked
+dnl programs. It basically means you can't have statically linked programs
+dnl which use the network under Solaris.
+dnl
+case "$host_os" in
+solaris2.*)
+ ac_cv_e2fsprogs_use_static=no
+;;
+esac
AC_MSG_RESULT($ac_cv_e2fsprogs_use_static)
LDFLAG_STATIC=
if test $ac_cv_e2fsprogs_use_static = yes; then
@@ -522,6 +534,7 @@
test -d lib || mkdir lib
test -d include || mkdir include
test -d include/linux || mkdir include/linux
+test -d include/asm || mkdir include/asm
rmakefile=
if test -d ${srcdir}/resize ; then
rmakefile=resize/Makefile