On Fri, 8 Feb 2013, Lukas Czerner wrote:
> Date: Fri, 8 Feb 2013 12:07:01 +0100
> From: Lukas Czerner <lczerner@xxxxxxxxxx>
> To: linux-ext4@xxxxxxxxxxxxxxx
> Cc: sandeen@xxxxxxxxxx, tytso@xxxxxxx, Lukas Czerner <lczerner@xxxxxxxxxx>
> Subject: [PATCH 1/3] e2fsprogs: Build external libblkid by default
>
> This commit changes configure script to build external libblkid library by
> default instead of building the local blkid. The reason is that the
> the external libblkid is where all the development takes place and it
> should be always preferred option. We still have an option
> '--enable-blkid' to enable local build of the blkid library.
As we've previously discussed I'll drop the series, however I think
that this particular patch might be actually useful. What do you
think Ted ?
(I might need to rebase this one)
Thanks!
-Lukas
>
> Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
> ---
> configure | 60 ++++++++++++++++++++++++++++++++++++++++++++++++---------
> configure.in | 23 ++++++++++++---------
> 2 files changed, 63 insertions(+), 20 deletions(-)
>
> diff --git a/configure b/configure
> index 84e7e03..5b91c01 100755
> --- a/configure
> +++ b/configure
> @@ -1497,7 +1497,7 @@ Optional Features:
> --enable-blkid-debug enable blkid debugging
> --disable-testio-debug disable the use of the test I/O manager for debugging
> --disable-libuuid do not build private uuid library
> - --disable-libblkid do not build private blkid library
> + --enable-libblkid build private blkid library
> --enable-quota enable quota support
> --disable-debugfs disable support of debugfs program
> --disable-imager disable support of e2image program
> @@ -5168,16 +5168,56 @@ $as_echo "Enabling private blkid library" >&6; }
> fi
>
> else
> - LIBBLKID='$(LIB)/libblkid'$LIB_EXT
> -DEPLIBBLKID=$LIBBLKID
> -STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT
> -DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
> -PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
> -DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
> -$as_echo "#define CONFIG_BUILD_FINDFS 1" >>confdefs.h
> + if test -z "$PKG_CONFIG"; then
> + as_fn_error $? "pkg-config not installed; please install it." "$LINENO" 5
> +fi
> +
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for blkid_get_cache in -lblkid" >&5
> +$as_echo_n "checking for blkid_get_cache in -lblkid... " >&6; }
> +if ${ac_cv_lib_blkid_blkid_get_cache+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + ac_check_lib_save_LIBS=$LIBS
> +LIBS="-lblkid $LIBBLKID $LIBS"
> +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> +/* end confdefs.h. */
> +
> +/* Override any GCC internal prototype to avoid an error.
> + Use char because int might match the return type of a GCC
> + builtin and then its argument prototype would still apply. */
> +#ifdef __cplusplus
> +extern "C"
> +#endif
> +char blkid_get_cache ();
> +int
> +main ()
> +{
> +return blkid_get_cache ();
> + ;
> + return 0;
> +}
> +_ACEOF
> +if ac_fn_c_try_link "$LINENO"; then :
> + ac_cv_lib_blkid_blkid_get_cache=yes
> +else
> + ac_cv_lib_blkid_blkid_get_cache=no
> +fi
> +rm -f core conftest.err conftest.$ac_objext \
> + conftest$ac_exeext conftest.$ac_ext
> +LIBS=$ac_check_lib_save_LIBS
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
> +$as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
> +if test "x$ac_cv_lib_blkid_blkid_get_cache" = xyes; then :
> + LIBBLKID=`$PKG_CONFIG --libs blkid`;
> + STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
> +else
> + as_fn_error $? "external blkid library not found" "$LINENO" 5
> +fi
>
> -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling private blkid library by default" >&5
> -$as_echo "Enabling private blkid library by default" >&6; }
> +BLKID_CMT=#
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling private blkid library by default" >&5
> +$as_echo "Disabling private blkid library by default" >&6; }
>
> fi
>
> diff --git a/configure.in b/configure.in
> index ac3cd92..68fc806 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -509,7 +509,7 @@ AC_SUBST(PROFILED_LIBUUID)
> AC_SUBST(DEPPROFILED_LIBUUID)
> AC_SUBST(UUID_CMT)
> dnl
> -dnl handle --disable-libblkid
> +dnl handle --enable-libblkid
> dnl
> PKG_PROG_PKG_CONFIG
> LIBBLKID=
> @@ -521,7 +521,7 @@ DEPPROFILED_LIBBLKID=
> BLKID_CMT=
> AH_TEMPLATE([CONFIG_BUILD_FINDFS], [Define to 1 to compile findfs])
> AC_ARG_ENABLE([libblkid],
> -[ --disable-libblkid do not build private blkid library],
> +[ --enable-libblkid build private blkid library],
> if test "$enableval" = "no"
> then
> if test -z "$PKG_CONFIG"; then
> @@ -546,14 +546,17 @@ else
> AC_MSG_RESULT([Enabling private blkid library])
> fi
> ,
> -LIBBLKID='$(LIB)/libblkid'$LIB_EXT
> -DEPLIBBLKID=$LIBBLKID
> -STATIC_LIBBLKID='$(LIB)/libblkid'$STATIC_LIB_EXT
> -DEPSTATIC_LIBBLKID=$STATIC_LIBBLKID
> -PROFILED_LIBBLKID='$(LIB)/libblkid'$PROFILED_LIB_EXT
> -DEPPROFILED_LIBBLKID=$PROFILED_LIBBLKID
> -AC_DEFINE(CONFIG_BUILD_FINDFS, 1)
> -AC_MSG_RESULT([Enabling private blkid library by default])
> +if test -z "$PKG_CONFIG"; then
> + AC_MSG_ERROR([pkg-config not installed; please install it.])
> +fi
> +
> +AC_CHECK_LIB(blkid, blkid_get_cache,
> + [LIBBLKID=`$PKG_CONFIG --libs blkid`;
> + STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
> + [AC_MSG_ERROR([external blkid library not found])],
> + [$LIBBLKID])
> +BLKID_CMT=#
> +AC_MSG_RESULT([Disabling private blkid library by default])
> )
> AC_SUBST(LIBBLKID)
> AC_SUBST(DEPLIBBLKID)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
