summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure12
-rw-r--r--configure.in4
2 files changed, 8 insertions, 8 deletions
diff --git a/configure b/configure
index 6572f0dfcef..d0ed64546d6 100755
--- a/configure
+++ b/configure
@@ -6287,13 +6287,13 @@ echo "${ECHO_T}yes" >&6; }
{ echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5
echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6; }
- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"`
+ ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5
echo "${ECHO_T}$ALSA_CFLAGS" >&6; }
{ echo "$as_me:$LINENO: checking ALSA_LIBS" >&5
echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6; }
- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"`
+ ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
echo "${ECHO_T}$ALSA_LIBS" >&6; }
else
@@ -10952,13 +10952,13 @@ echo "${ECHO_T}yes" >&6; }
{ echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; }
- GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"`
+ GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
echo "${ECHO_T}$GTK_CFLAGS" >&6; }
{ echo "$as_me:$LINENO: checking GTK_LIBS" >&5
echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; }
- GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"`
+ GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
echo "${ECHO_T}$GTK_LIBS" >&6; }
else
@@ -11698,13 +11698,13 @@ echo "${ECHO_T}yes" >&6; }
{ echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5
echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; }
- XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"`
+ XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5
echo "${ECHO_T}$XFT_CFLAGS" >&6; }
{ echo "$as_me:$LINENO: checking XFT_LIBS" >&5
echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; }
- XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"`
+ XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'`
{ echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
echo "${ECHO_T}$XFT_LIBS" >&6; }
else
diff --git a/configure.in b/configure.in
index 5365649056d..e0883acee91 100644
--- a/configure.in
+++ b/configure.in
@@ -1484,11 +1484,11 @@ AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"|sed -e 's,///*,/,g'`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
- $1_LIBS=`$PKG_CONFIG --libs "$2"`
+ $1_LIBS=`$PKG_CONFIG --libs "$2"|sed -e 's,///*,/,g'`
AC_MSG_RESULT($$1_LIBS)
else
AC_MSG_RESULT(no)