# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1382168109 -32400
# Branch GECKO3110_2014082819_RELBRANCH
# Node ID 730f978b8593cd25b19bf047bac7ce3e9d9d9d28
# Parent  d25a216ccbd2ff696484e2b5d3044721ab39a202
$topsrcdir -> $_topsrcdir

diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -3710,19 +3710,19 @@
 _SAVE_CFLAGS=$CFLAGS
 _SAVE_LDFLAGS=$LDFLAGS
 _SAVE_LIBS=$LIBS
 
 dnl === TenFourFox issue 51
 if test -z "$MOZ_SYSTEM_JPEG" -a "${JPEG_DIR}" = "yes"; then
         echo "Using OS X native libjpeg"
         JPEG_DIR="/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources"
-        CFLAGS="-I${topsrcdir}/jpeg-imageio $CFLAGS"
+        CFLAGS="-I${_topsrcdir}/jpeg-imageio $CFLAGS"
         LDFLAGS="-L${JPEG_DIR} $LDFLAGS"
-        AC_CHECK_LIB(JPEG, _cg_jpeg_destroy_compress, [MOZ_NATIVE_JPEG=1 MOZ_JPEG_LIBS="-L/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources -lJPEG" JPEG_CFLAGS="-I${topsrcdir}/jpeg-imageio"], MOZ_NATIVE_JPEG=)
+        AC_CHECK_LIB(JPEG, _cg_jpeg_destroy_compress, [MOZ_NATIVE_JPEG=1 MOZ_JPEG_LIBS="-L/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources -lJPEG" JPEG_CFLAGS="-I${_topsrcdir}/jpeg-imageio"], MOZ_NATIVE_JPEG=)
 else
 
 if test -n "${JPEG_DIR}" -a "${JPEG_DIR}" != "yes"; then
     CFLAGS="-I${JPEG_DIR}/include $CFLAGS"
     LDFLAGS="-L${JPEG_DIR}/lib $LDFLAGS"
 fi
 if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then
     MOZ_NATIVE_JPEG=
@@ -3744,17 +3744,17 @@
                    AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
 fi
 CFLAGS=$_SAVE_CFLAGS
 LDFLAGS=$_SAVE_LDFLAGS
 LIBS=$_SAVE_LIBS
 
 dnl === TenFourFox issue 51
 if test "$MOZ_NATIVE_JPEG" = 1 -a "${JPEG_DIR}" = "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources"; then
- MOZ_JPEG_CFLAGS="-I${topsrcdir}/jpeg-imageio"
+ MOZ_JPEG_CFLAGS="-I${_topsrcdir}/jpeg-imageio"
  MOZ_JPEG_LIBS="-L${JPEG_DIR} ${MOZ_JPEG_LIBS}"
 else
 
 if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then
     MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include"
     MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}"
 fi
 
