projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
memory: double check that mmapfd isn't -1 before closing
[fio.git]
/
configure
diff --git
a/configure
b/configure
index aaad70e20958129ef8f837411c7b1235f0306f1b..172b235bc540ef63ae25125a725a398c96d018a1 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-1010,6
+1010,8
@@
int main(void)
}
EOF
GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0 gthread-2.0)
}
EOF
GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0 gthread-2.0)
+ORG_LDFLAGS=$LDFLAGS
+LDFLAGS=$(echo $LDFLAGS | sed s/"-static"//g)
if test "$?" != "0" ; then
echo "configure: gtk and gthread not found"
exit 1
if test "$?" != "0" ; then
echo "configure: gtk and gthread not found"
exit 1
@@
-1023,7
+1025,7
@@
if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then
r=$($TMPE)
if test "$r" != "0" ; then
gfio="yes"
r=$($TMPE)
if test "$r" != "0" ; then
gfio="yes"
- LIBS="$LIBS $GTK_LIBS"
+
GFIO_
LIBS="$LIBS $GTK_LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
else
echo "GTK found, but need version 2.18 or higher"
CFLAGS="$CFLAGS $GTK_CFLAGS"
else
echo "GTK found, but need version 2.18 or higher"
@@
-1033,6
+1035,7
@@
else
echo "Please install gtk and gdk libraries"
gfio="no"
fi
echo "Please install gtk and gdk libraries"
gfio="no"
fi
+LDFLAGS=$ORG_LDFLAGS
fi
if test "$gfio_check" = "yes" ; then
fi
if test "$gfio_check" = "yes" ; then
@@
-1563,7
+1566,10
@@
if test "$gf_trim" = "yes" ; then
fi
if test "$libhdfs" = "yes" ; then
output_sym "CONFIG_LIBHDFS"
fi
if test "$libhdfs" = "yes" ; then
output_sym "CONFIG_LIBHDFS"
-fi
+ echo "JAVA_HOME=$JAVA_HOME" >> $config_host_mak
+ echo "FIO_LIBHDFS_INCLUDE=$FIO_LIBHDFS_INCLUDE" >> $config_host_mak
+ echo "FIO_LIBHDFS_LIB=$FIO_LIBHDFS_LIB" >> $config_host_mak
+ fi
if test "$arith" = "yes" ; then
output_sym "CONFIG_ARITHMETIC"
if test "$yacc_is_bison" = "yes" ; then
if test "$arith" = "yes" ; then
output_sym "CONFIG_ARITHMETIC"
if test "$yacc_is_bison" = "yes" ; then
@@
-1578,6
+1584,7
@@
if test "$zlib" = "no" ; then
fi
echo "LIBS+=$LIBS" >> $config_host_mak
fi
echo "LIBS+=$LIBS" >> $config_host_mak
+echo "GFIO_LIBS+=$GFIO_LIBS" >> $config_host_mak
echo "CFLAGS+=$CFLAGS" >> $config_host_mak
echo "LDFLAGS+=$LDFLAGS" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
echo "CFLAGS+=$CFLAGS" >> $config_host_mak
echo "LDFLAGS+=$LDFLAGS" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak