diff -uprk.orig magicpoint-1.10a.orig/configure.in magicpoint-1.10a/configure.in

--- magicpoint-1.10a.orig/configure.in	2003-05-28 09:34:23 +0400

+++ magicpoint-1.10a/configure.in	2004-02-10 19:09:12 +0300

@@ -55,7 +55,7 @@ AC_ARG_ENABLE(locale,

 	[  --enable-locale         perform setlocale() on invocation.],

 	[mgp_locale="$enableval"],

 	[mgp_locale="no"])

-if test $mgp_locale = "yes"; then

+if test "$mgp_locale" = "yes"; then

   OPTFLAGS="$OPTFLAGS -DUSE_SETLOCALE"

 fi

 AC_MSG_RESULT($mgp_locale)

@@ -113,7 +113,7 @@ if test "$mgp_use_freetype" = "yes"; the

 		fi

  		if test "$ac_cv_ft_lib" != "no" -a "$ac_cv_ft_include" != "no"; then

  			LIBS="-L$ac_cv_ft_lib $LIBS"

- 			CFLAGS="-I$ac_cv_ft_include $CFLAGS"

+ 			test "$ac_cv_ft_include" = /usr/include || CFLAGS="-I$ac_cv_ft_include $CFLAGS"

  			break

  		fi

  	done

@@ -125,7 +125,7 @@ if test "$mgp_use_freetype" = "yes"; the

  	fi

         if test "$mgp_use_freetype" = "yes"; then

 	  LIBS="-L$ac_cv_ft_lib $LIBS"

-	  OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS"

+	  test "$ac_cv_ft_include" = /usr/include || OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS"

 	  DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS"

 	  AC_CHECK_LIB(intl, dgettext)

  	  AC_CHECK_LIB(ttf, TT_Init_FreeType, [],

@@ -151,12 +151,10 @@ AC_ARG_ENABLE(xft2,

 	[mgp_use_xft2="yes"])

 AC_MSG_RESULT($mgp_use_xft2)

 if test "$mgp_use_xft2" = "yes"; then

-  if type pkg-config > /dev/null 2>&1; then

-     if pkg-config xft; then

+  if pkg-config xft >/dev/null 2>&1; then

         OPTFLAGS="`pkg-config --cflags xft` $OPTFLAGS"

         LIBS="$LIBS `pkg-config --libs xft`"

         AC_DEFINE(USE_XFT2)

-     fi

   else

 	AC_MSG_CHECKING(for xft2 and ft2 and fc header..)

 	for dir in /usr/include /usr/include/Xft2 /usr/X11R6/include \

@@ -176,13 +174,13 @@ if test "$mgp_use_xft2" = "yes"; then

 		mgp_use_xft2=no

 	else

 		AC_MSG_RESULT($ac_cv_xft2_hdrdir and $ac_cv_ft2_hdrdir and $ac_cv_fc_hdrdir)

-		if test $ac_cv_xft2_hdrdir != "/usr/include" ; then

+		if test "$ac_cv_xft2_hdrdir" != "/usr/include" ; then

 			OPTFLAGS="-I$ac_cv_xft2_hdrdir $OPTFLAGS"

 		fi

-		if test $ac_cv_ft2_hdrdir != "/usr/include" ; then

+		if test "$ac_cv_ft2_hdrdir" != "/usr/include" ; then

 			OPTFLAGS="-I$ac_cv_ft2_hdrdir $OPTFLAGS"

 		fi

-		if test $ac_cv_fc_hdrdir != "/usr/include" ; then

+		if test "$ac_cv_fc_hdrdir" != "/usr/include" ; then

 			OPTFLAGS="-I$ac_cv_fc_hdrdir $OPTFLAGS"

 		fi

 	fi

@@ -306,12 +304,10 @@ if test "$mgp_use_freetype" = "yes"; the

 	fi

 fi

-if type pkg-config > /dev/null 2>&1; then

-  if pkg-config libpng; then

+if pkg-config libpng >/dev/null 2>&1; then

      LIBS="$LIBS `pkg-config --libs libpng`"

      OPTFLAGS="$OPTFLAGS `pkg-config --cflags libpng`"

      AC_DEFINE(USE_PNG)

-  fi

 else

   for i in /usr/pkg /usr/local /usr; do

 	if test -f $i/include/png.h; then 

@@ -338,17 +334,17 @@ fi

 for i in /usr/pkg /usr/local /usr; do

 	if test -f $i/include/libmng.h; then 

-		if test -f $i/lib/libmng.a ; then

-			DEPLIBS="$DEPLIBS $i/lib/libmng.a"

-		elif test -f $i/lib/libmng.so ; then

+		if test -f $i/lib/libmng.so ; then

 			DEPLIBS="$DEPLIBS $i/lib/libmng.so"

+		elif test -f $i/lib/libmng.a ; then

+			DEPLIBS="$DEPLIBS $i/lib/libmng.a"

 		else

 			break;

 		fi

 		LIBS="$LIBS -L$i/lib"

-		OPTFLAGS="$OPTFLAGS -I$i/include"

+		test "$i" = /usr || OPTFLAGS="$OPTFLAGS -I$i/include"

 		AC_CHECK_LIB(mng, mng_initialize, 

-			[LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"

+			[LIBS="$LIBS -lmng"

 			 AC_DEFINE(MNG)], 

 		[AC_CHECK_LIB(mng, mng_readdisplay,

 			[LIBS="$LIBS -lmng -ljpeg"

@@ -366,7 +362,7 @@ AC_ARG_ENABLE(gif,

 	[mgp_gif="$enableval"],

 	[mgp_gif="no"])

 AC_MSG_RESULT($mgp_gif)

-if test $mgp_gif = "yes"; then

+if test "$mgp_gif" = "yes"; then

 	AC_CHECK_LIB(ungif, DGifOpenFileHandle,

 		[gif_ok=yes

 		GIFLIB="-lungif"

@@ -391,7 +387,7 @@ if test $mgp_gif = "yes"; then

 	for i in /usr/pkg /usr/local /usr; do

 		if test -f $i/include/gif_lib.h; then

 			gif_h_ok=yes

-			OPTFLAGS="$OPTFLAGS -I$i/include"

+			test "$i" = /usr || OPTFLAGS="$OPTFLAGS -I$i/include"

 			break

 		fi

 	done

@@ -412,14 +408,12 @@ AC_ARG_ENABLE(imlib,

 	[mgp_imlib="$enableval"],

 	[mgp_imlib="no"])

 AC_MSG_RESULT($mgp_imlib)

-if test $mgp_imlib = "yes"; then

-  if type pkg-config > /dev/null 2>&1; then

-     if pkg-config imlib; then

+if test "$mgp_imlib" = "yes"; then

+  if pkg-config imlib >/dev/null 2>&1; then

         LIBS="$LIBS `pkg-config --libs imlib`"

         OPTFLAGS="$OPTFLAGS `pkg-config --cflags imlib`"

 	AC_DEFINE(USE_IMLIB)

 	USE_IMLIB=1

-     fi

   else

 	AC_CHECK_LIB(Imlib, Imlib_init,

 		[imlib_ok=yes

@@ -431,16 +425,13 @@ if test $mgp_imlib = "yes"; then

 		echo 'FATAL: You need libImlib to use Imlib loading.  pass proper LIBS to configure.'

 		exit 1

 	fi

-	for i in /usr/pkg /usr/local; do

+	for i in /usr/pkg /usr/local /usr; do

 		if test -f $i/include/Imlib.h; then

 			imlib_h_ok=yes

-			OPTFLAGS="$OPTFLAGS -I$i/include"

+			test "$i" = /usr || OPTFLAGS="$OPTFLAGS -I$i/include"

 			break

 		fi

 	done

-	if test -f /usr/include/Imlib.h; then

-		imlib_h_ok=yes

-	fi

 	if test "x$imlib_h_ok" != "xyes"; then

 		echo 'FATAL: can not find Imlib.h.  pass proper CPPFLAGS to configure.'

 		exit 1