← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mod-wsgi/saucy-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs
  • Date: 2012-10-23 16:00:24 UTC
  • Revision ID: package-import@ubuntu.com-20121023160024-s71bcwhj423kgnep
Tags: 3.4-0ubuntu2
Patch configure.ac to build against pythonX.Y-config. This builds
python3.3 module, but default module symlink still points to 3.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
77
77
    from distutils import sysconfig; \
78
78
    stdout.write((sysconfig.get_config_var("VERSION")))'`
79
79
 
80
 
CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
81
 
    from distutils import sysconfig; \
82
 
    stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
83
 
 
84
 
CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \
85
 
    from distutils import sysconfig; \
86
 
    stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \
87
 
    sysconfig.get_config_var("CFLAGS").split())))'`
 
80
CPPFLAGS1=`${PYTHON}-config --includes`
88
81
 
89
82
if test "${ENABLE_EMBEDDED}" != "yes"; then
90
83
CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
92
85
CPPFLAGS3=""
93
86
fi
94
87
 
95
 
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
 
88
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS3}"
96
89
 
97
90
AC_SUBST(CPPFLAGS)
98
91
 
113
106
    from distutils import sysconfig; \
114
107
    stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
115
108
 
116
 
if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
117
 
        "${ENABLE_FRAMEWORK}" != "yes"; then
118
 
    LDFLAGS1="-L${PYTHONLIBDIR}"
119
 
    LDFLAGS2="-L${PYTHONCFGDIR}"
120
 
 
121
 
    LDLIBS1="-lpython${PYTHON_VERSION}"
122
 
    LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
123
 
        from distutils import sysconfig; \
124
 
        stdout.write(sysconfig.get_config_var("LIBS"))'`
125
 
    LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
126
 
        from distutils import sysconfig; \
127
 
        stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
128
 
else
129
 
    LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
130
 
 
131
 
    VERSION="${PYTHON_VERSION}"
132
 
    STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
133
 
    LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
134
 
        from distutils import sysconfig; \
135
 
        stdout.write(sysconfig.get_config_var(
136
 
        \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
137
 
 
138
 
    LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
139
 
        from distutils import sysconfig; \
140
 
        stdout.write(sysconfig.get_config_var("LIBS"))'`
141
 
fi
 
109
LDFLAGS1=`${PYTHON}-config --ldflags`
142
110
 
143
111
CFLAGS1=""
144
112
for arg in ${CFLAGS}
157
125
fi
158
126
 
159
127
CFLAGS="${CFLAGS1} ${CFLAGS2}"
160
 
LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
161
 
LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
128
LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS3}"
 
129
LDLIBS="${LDLIBS}"
162
130
 
163
131
AC_SUBST(CFLAGS)
164
132
AC_SUBST(LDFLAGS)