projects / packages / e2fsprogs.git / blame
| Commit | Line | Data |
|---|---|---|
| 7f4443f1 AM |
1 | diff -urN e2fsprogs-1.41.8.org/configure.in e2fsprogs-1.41.8/configure.in |
| 2 | --- e2fsprogs-1.41.8.org/configure.in 2009-07-04 14:38:20.000000000 +0200 | |
| 3 | +++ e2fsprogs-1.41.8/configure.in 2009-07-19 06:37:21.032338841 +0200 | |
| 4 | @@ -411,39 +411,12 @@ | |
| 5 | PROFILED_LIBUUID= | |
| 6 | DEPPROFILED_LIBUUID= | |
| 7 | UUID_CMT= | |
| 8 | -AC_ARG_ENABLE([libuuid], | |
| 9 | -[ --disable-libuuid do not build private uuid library], | |
| 10 | -if test "$enableval" = "no" | |
| 11 | -then | |
| 12 | - if test -z "$PKG_CONFIG"; then | |
| 13 | - AC_MSG_ERROR([pkg-config not installed; please install it.]) | |
| 14 | - fi | |
| 15 | ||
| 16 | - AC_CHECK_LIB(uuid, uuid_generate, | |
| 17 | - [LIBUUID=`$PKG_CONFIG --libs uuid`; | |
| 18 | - STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`], | |
| 19 | - [AC_MSG_ERROR([external uuid library not found])], | |
| 20 | - [$LIBUUID]) | |
| 21 | - UUID_CMT=# | |
| 22 | - AC_MSG_RESULT([Disabling private uuid library]) | |
| 23 | -else | |
| 24 | - LIBUUID='$(LIB)/libuuid'$LIB_EXT | |
| 25 | - DEPLIBUUID=$LIBUUID | |
| 26 | - STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT | |
| 27 | - DEPSTATIC_LIBUUID=$STATIC_LIBUUID | |
| 28 | - PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT | |
| 29 | - DEPPROFILED_LIBUUID=$PROFILED_LIBUUID | |
| 30 | - AC_MSG_RESULT([Enabling private uuid library]) | |
| 31 | -fi | |
| 32 | -, | |
| 33 | -LIBUUID='$(LIB)/libuuid'$LIB_EXT | |
| 34 | -DEPLIBUUID=$LIBUUID | |
| 35 | -STATIC_LIBUUID='$(LIB)/libuuid'$STATIC_LIB_EXT | |
| 36 | -DEPSTATIC_LIBUUID=$STATIC_LIBUUID | |
| 37 | -PROFILED_LIBUUID='$(LIB)/libuuid'$PROFILED_LIB_EXT | |
| 38 | -DEPPROFILED_LIBUUID=$PROFILED_LIBUUID | |
| 39 | -AC_MSG_RESULT([Enabling private uuid library by default]) | |
| 40 | -) | |
| 41 | +LIBUUID="-luuid" | |
| 42 | +DEPLIBUUID=$LIBUUID | |
| 43 | +STATIC_LIBUUID="-luuid" | |
| 44 | +DEPSTATIC_LIBUUID=$STATIC_LIBUUID | |
| 45 | +UUID_CMT='#' | |
| 46 | AC_SUBST(LIBUUID) | |
| 47 | AC_SUBST(DEPLIBUUID) | |
| 48 | AC_SUBST(STATIC_LIBUUID) |