3 files changed, 9 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 7197634..8dc5cc6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -159,8 +159,8 @@ if test x"$enable_m17n" = xno; then
 else
  AC_DEFINE(USE_M17N)
  WCTARGET="libwc"
- WCCFLAGS="-I. -I.."
- wcinclude="-I./libwc"
+ WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
+ wcinclude='-I$(srcdir)/libwc'
  wclib="-L./libwc -lwc"
  AC_MSG_CHECKING(if unicode support is enabled)
  AC_ARG_ENABLE(unicode,
@@ -196,7 +196,7 @@ else
   [  --with-charset=CHARSET],
   [test x"with_charset" = xyes || display_charset="$with_charset"])
  AC_MSG_RESULT($display_charset)
- display_charset=`awk '$[1] == "'$display_charset'" {print $[2]}' charset-list`
+ display_charset=`awk '$[1] == "'$display_charset'" {print $[2]}' $srcdir/charset-list`
  case "$display_charset" in
    WC_CES_ISO_2022_JP*)
      system_charset=WC_CES_EUC_JP
diff --git a/aclocal.m4 b/aclocal.m4
index 6fcd970..84e2d2f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -171,8 +171,8 @@ if test x"$enable_m17n" = xno; then
 else
  AC_DEFINE(USE_M17N)
  WCTARGET="libwc"
- WCCFLAGS="-I. -I.."
- wcinclude="-I./libwc"
+ WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
+ wcinclude='-I$(srcdir)/libwc'
  wclib="-L./libwc -lwc"
  AC_MSG_CHECKING(if unicode support is enabled)
  AC_ARG_ENABLE(unicode,
@@ -208,7 +208,7 @@ else
   [  --with-charset=CHARSET],
   [test x"with_charset" = xyes || display_charset="$with_charset"])
  AC_MSG_RESULT($display_charset)
- display_charset=`awk '$[1] == "'$display_charset'" {print $[2]}' charset-list`
+ display_charset=`awk '$[1] == "'$display_charset'" {print $[2]}' $srcdir/charset-list`
  case "$display_charset" in
    WC_CES_ISO_2022_JP*)
      system_charset=WC_CES_EUC_JP
diff --git a/configure b/configure
index e26f9de..6b94484 100755
--- a/configure
+++ b/configure
@@ -2951,8 +2951,8 @@ else
 _ACEOF
 
  WCTARGET="libwc"
- WCCFLAGS="-I. -I.."
- wcinclude="-I./libwc"
+ WCCFLAGS='-I$(srcdir) -I$(srcdir)/..'
+ wcinclude='-I$(srcdir)/libwc'
  wclib="-L./libwc -lwc"
  echo "$as_me:$LINENO: checking if unicode support is enabled" >&5
 echo $ECHO_N "checking if unicode support is enabled... $ECHO_C" >&6
@@ -3007,7 +3007,7 @@ if test "${with_charset+set}" = set; then
 fi;
  echo "$as_me:$LINENO: result: $display_charset" >&5
 echo "${ECHO_T}$display_charset" >&6
- display_charset=`awk '$1 == "'$display_charset'" {print $2}' charset-list`
+ display_charset=`awk '$1 == "'$display_charset'" {print $2}' $srcdir/charset-list`
  case "$display_charset" in
    WC_CES_ISO_2022_JP*)
      system_charset=WC_CES_EUC_JP