From: rwst <rwst@users.sourceforge.net>
Date: Tue, 17 Jan 2006 10:30:34 +0000 (+0000)
Subject: applying patch #1368738 from yselkowitz
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a0771c8c4737d0bd36a7fa941fda2d85093ea2f;p=inkscape.git

applying patch #1368738 from yselkowitz
---

diff --git a/configure.ac b/configure.ac
index dd3981c60..b0ce823c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,18 +179,18 @@ AC_SUBST(FREETYPE_LIBS)
 dnl ******************************
 dnl Win32
 dnl ******************************
-AC_MSG_CHECKING([for Win32 platform])
+AC_MSG_CHECKING([for native Win32])
 case "$host" in
   *-*-mingw*)
-    platform_win32=yes
+    os_win32=yes
     INKSCAPE_CFLAGS="$INKSCAPE_CFLAGS -mms-bitfields -DLIBXML_STATIC"
     ;;
   *)
-    platform_win32=no
+    os_win32=no
     ;;
 esac
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 
 dnl ******************************
 dnl Xft checking
@@ -350,7 +350,7 @@ if test "x$with_perl" = "xyes"; then
     if test "$?" -gt "0"; then
         with_perl="no"
     else
-        checkPERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
+        checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null`
         if test "$?" -gt "0"; then
             with_perl="no"
         else
@@ -362,22 +362,22 @@ AC_MSG_RESULT([$with_perl])
 if test "x$with_perl" = "xyes"; then
     # Test that we actually have the perl libraries installed
     oldCFLAGS="$CFLAGS"
-    oldLDFLAGS="$LDFLAGS"
+    oldLIBS="$LIBS"
     CFLAGS="$CFLAGS $checkPERL_CFLAGS"
-    LDFLAGS="$LDFLAGS $checkPERL_LDFLAGS"
+    LIBS="$LIBS $checkPERL_LIBS"
     AC_CHECK_FUNC([perl_parse],[
 	PERL_CFLAGS="$checkPERL_CFLAGS"
-	PERL_LDFLAGS="$checkPERL_LDFLAGS"
+	PERL_LIBS="$checkPERL_LIBS"
         AC_DEFINE(WITH_PERL, 1, [use Perl for embedded scripting])
         ],[
 	with_perl="no"
 	])
     CFLAGS="$oldCFLAGS"
-    LDFLAGS="$oldLDFLAGS"
+    LIBS="$oldLIBS"
 fi
 AM_CONDITIONAL(WITH_PERL, test "x$with_perl" = "xyes")
 AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LDFLAGS)
+AC_SUBST(PERL_LIBS)
 
 dnl ******************************
 dnl Python checking
@@ -393,7 +393,7 @@ if test "x$with_python" = "xyes"; then
     if test "$?" -gt "0"; then
         with_python="no"
     else
-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
         if test "$?" -gt "0"; then
             with_python="no"
         else
diff --git a/src/Makefile_insert b/src/Makefile_insert
index 44439f164..3c7d827c8 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -7,7 +7,7 @@
 #
 # ################################################
 
-if PLATFORM_WIN32
+if OS_WIN32
 win32_sources = winmain.cpp
 win32ldflags = -lcomdlg32
 endif 
@@ -279,7 +279,7 @@ all_libs =			\
 	$(FREETYPE_LIBS)	\
 	$(kdeldadd)		\
 	$(win32ldflags)		\
-	$(PERL_LDFLAGS)		\
+	$(PERL_LIBS)		\
 	$(PYTHON_LIBS)	\
 	$(LIBLOUDMOUTH_LIBS)