diff options
| author | Jan Djärv | 2007-01-31 17:40:56 +0000 |
|---|---|---|
| committer | Jan Djärv | 2007-01-31 17:40:56 +0000 |
| commit | 94315858dcf3a8157e0e077ce79db52ade804356 (patch) | |
| tree | 5ad9eefba401fb6892b1b64e1205e46330f3892f | |
| parent | ccaa42ede56a265f9a9dca53bd8ccd3e44f9a7ec (diff) | |
| download | emacs-94315858dcf3a8157e0e077ce79db52ade804356.tar.gz emacs-94315858dcf3a8157e0e077ce79db52ade804356.zip | |
* configure.in (PKG_CHECK_MODULES): Change ///* to / in cflags and
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 8 insertions, 8 deletions
| @@ -6287,13 +6287,13 @@ echo "${ECHO_T}yes" >&6; } | |||
| 6287 | 6287 | ||
| 6288 | { echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 | 6288 | { echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 |
| 6289 | echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6; } | 6289 | echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6; } |
| 6290 | ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"` | 6290 | ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'` |
| 6291 | { echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 | 6291 | { echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 |
| 6292 | echo "${ECHO_T}$ALSA_CFLAGS" >&6; } | 6292 | echo "${ECHO_T}$ALSA_CFLAGS" >&6; } |
| 6293 | 6293 | ||
| 6294 | { echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 | 6294 | { echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 |
| 6295 | echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6; } | 6295 | echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6; } |
| 6296 | ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"` | 6296 | ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'` |
| 6297 | { echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 | 6297 | { echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 |
| 6298 | echo "${ECHO_T}$ALSA_LIBS" >&6; } | 6298 | echo "${ECHO_T}$ALSA_LIBS" >&6; } |
| 6299 | else | 6299 | else |
| @@ -10952,13 +10952,13 @@ echo "${ECHO_T}yes" >&6; } | |||
| 10952 | 10952 | ||
| 10953 | { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 | 10953 | { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 |
| 10954 | echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; } | 10954 | echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; } |
| 10955 | GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"` | 10955 | GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"|sed -e 's,///*,/,g'` |
| 10956 | { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 | 10956 | { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 |
| 10957 | echo "${ECHO_T}$GTK_CFLAGS" >&6; } | 10957 | echo "${ECHO_T}$GTK_CFLAGS" >&6; } |
| 10958 | 10958 | ||
| 10959 | { echo "$as_me:$LINENO: checking GTK_LIBS" >&5 | 10959 | { echo "$as_me:$LINENO: checking GTK_LIBS" >&5 |
| 10960 | echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; } | 10960 | echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; } |
| 10961 | GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"` | 10961 | GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"|sed -e 's,///*,/,g'` |
| 10962 | { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 | 10962 | { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 |
| 10963 | echo "${ECHO_T}$GTK_LIBS" >&6; } | 10963 | echo "${ECHO_T}$GTK_LIBS" >&6; } |
| 10964 | else | 10964 | else |
| @@ -11698,13 +11698,13 @@ echo "${ECHO_T}yes" >&6; } | |||
| 11698 | 11698 | ||
| 11699 | { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5 | 11699 | { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5 |
| 11700 | echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; } | 11700 | echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; } |
| 11701 | XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"` | 11701 | XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'` |
| 11702 | { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5 | 11702 | { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5 |
| 11703 | echo "${ECHO_T}$XFT_CFLAGS" >&6; } | 11703 | echo "${ECHO_T}$XFT_CFLAGS" >&6; } |
| 11704 | 11704 | ||
| 11705 | { echo "$as_me:$LINENO: checking XFT_LIBS" >&5 | 11705 | { echo "$as_me:$LINENO: checking XFT_LIBS" >&5 |
| 11706 | echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; } | 11706 | echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; } |
| 11707 | XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"` | 11707 | XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'` |
| 11708 | { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5 | 11708 | { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5 |
| 11709 | echo "${ECHO_T}$XFT_LIBS" >&6; } | 11709 | echo "${ECHO_T}$XFT_LIBS" >&6; } |
| 11710 | else | 11710 | 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], [ | |||
| 1484 | succeeded=yes | 1484 | succeeded=yes |
| 1485 | 1485 | ||
| 1486 | AC_MSG_CHECKING($1_CFLAGS) | 1486 | AC_MSG_CHECKING($1_CFLAGS) |
| 1487 | $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` | 1487 | $1_CFLAGS=`$PKG_CONFIG --cflags "$2"|sed -e 's,///*,/,g'` |
| 1488 | AC_MSG_RESULT($$1_CFLAGS) | 1488 | AC_MSG_RESULT($$1_CFLAGS) |
| 1489 | 1489 | ||
| 1490 | AC_MSG_CHECKING($1_LIBS) | 1490 | AC_MSG_CHECKING($1_LIBS) |
| 1491 | $1_LIBS=`$PKG_CONFIG --libs "$2"` | 1491 | $1_LIBS=`$PKG_CONFIG --libs "$2"|sed -e 's,///*,/,g'` |
| 1492 | AC_MSG_RESULT($$1_LIBS) | 1492 | AC_MSG_RESULT($$1_LIBS) |
| 1493 | else | 1493 | else |
| 1494 | AC_MSG_RESULT(no) | 1494 | AC_MSG_RESULT(no) |