Ticket #36220: patch-m4-m4-ax_python_devel.m4.diff

m4/m4-ax_python_devel.m4

@@ -232 +232 @@
                 # credits goes to momjian, I think. I'd like to put the right name
                 # in the credits, if someone can point me in the right direction... ?
                 #
-                if test -n "$ac_python_libdir" -a -n "$ac_python_library" \
-                        -a x"$ac_python_library" != x"$ac_python_soname"
-                then
+                #echo "ac_python_libdir: x$ac_python_libdirx"
+                #echo "ac_python_library: x$ac_python_libraryx"
+                #echo "ac_python_soname: x$ac_python_sonamex"
+                #if test -n "$ac_python_libdir" -a -n "$ac_python_library" \
+                #       -a x"$ac_python_library" != x"$ac_python_soname"
+                #then
                         # use the official shared library
                         ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
-                        PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
-                else
-                        # old way: use libpython from python_configdir
-                        ac_python_libdir=`$PYTHON -c \
-                          "from distutils.sysconfig import get_python_lib as f; \
-                          import os; \
-                          print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
                         PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
-                fi
+                #else
+                #       # old way: use libpython from python_configdir
+                #       ac_python_libdir=`$PYTHON -c \
+                #         "from distutils.sysconfig import get_python_lib as f; \
+                #         import os; \
+                #         print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
+                #       PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
+                #fi
 
                 if test -z "PYTHON_LDFLAGS"; then
                         AC_MSG_WARN([
@@ -290 +293 @@
         if test -z "$PYTHON_EXTRA_LIBS"; then
            PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
                 conf = distutils.sysconfig.get_config_var; \
-                print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"`
+                print (conf('LOCALMODLIBS') + ' ' + conf('LDFLAGS') + ' ' + conf('LIBS'))"`
         fi
         AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
         AC_SUBST(PYTHON_EXTRA_LIBS)