← Back to branch summary

~james-page/ubuntu/natty/mod-wsgi/fix-749720

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Piotr Ożarowski
  • Date: 2009-10-11 21:27:30 UTC
  • mfrom: (1.1.6 upstream) (3.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20091011212730-lzcbi4ftcnkx7xyg
Tags: 2.6-1
* New upstream release
* configure-apache-version.dpatch removed, no longer needed
* Bump Standards-Version to 3.8.3 (no changes needed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
18
18
 
19
19
AC_INIT(mod_wsgi.c)
20
20
 
 
21
AC_ARG_ENABLE(framework, AC_HELP_STRING([--disable-framework],
 
22
            [disable mod_wsgi framework link]),
 
23
            [ENABLE_FRAMEWORK=$enableval],
 
24
            [ENABLE_FRAMEWORK=yes])
 
25
 
21
26
AC_ARG_ENABLE(embedded, AC_HELP_STRING([--disable-embedded],
22
27
            [disable mod_wsgi embedded mode]),
23
28
            [ENABLE_EMBEDDED=$enableval],
36
41
 
37
42
AC_MSG_CHECKING(Apache version)
38
43
HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
39
 
HTTPD_VERSION=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
 
44
HTTPD_INCLUDEDIR="`${APXS} -q INCLUDEDIR`"
 
45
if test -x ${HTTPD}; then
 
46
    HTTPD_VERSION=`${HTTPD} -v | awk '/version/ {print $3}' \
 
47
     | awk -F/ '{print $2}'`
 
48
else
 
49
    if test -f ${HTTPD_INCLUDEDIR}/ap_release.h; then
 
50
        HTTPD_VERSION=`grep '^#define AP_SERVER_MAJORVERSION_NUMBER ' \
 
51
         ${HTTPD_INCLUDEDIR}/ap_release.h | sed -e \
 
52
         's/^#define AP_SERVER_MAJORVERSION_NUMBER \([0-9]\).*/\1.X/'`
 
53
    else
 
54
        if test -f ${HTTPD_INCLUDEDIR}/httpd.h; then
 
55
            HTTPD_VERSION=`grep '^#define APACHE_RELEASE ' \
 
56
             ${HTTPD_INCLUDEDIR}/httpd.h | sed -e \
 
57
             's/^#define APACHE_RELEASE \([0-9]\).*/\1.X/'`
 
58
        else
 
59
            HTTPD_VERSION="2.?"
 
60
        fi
 
61
    fi
 
62
fi
40
63
AC_MSG_RESULT($HTTPD_VERSION)
41
64
 
42
65
AC_ARG_WITH(python, AC_HELP_STRING([--with-python=NAME],
90
113
    from distutils import sysconfig; \
91
114
    stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
92
115
 
93
 
if test "${PYTHONFRAMEWORKDIR}" = "no-framework"; then
 
116
if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
 
117
        "${ENABLE_FRAMEWORK}" != "yes"; then
94
118
    LDFLAGS1="-L${PYTHONLIBDIR}"
95
119
    LDFLAGS2="-L${PYTHONCFGDIR}"
96
120
 
102
126
        from distutils import sysconfig; \
103
127
        stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
104
128
else
105
 
    if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then
106
 
        LDFLAGS2="-L${PYTHONCFGDIR}"
107
 
 
108
 
        LDLIBS1="-lpython${PYTHON_VERSION}"
109
 
        LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
110
 
            from distutils import sysconfig; \
111
 
            stdout.write(sysconfig.get_config_var("LIBS"))'`
112
 
        LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
113
 
            from distutils import sysconfig; \
114
 
            stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
115
 
    else
116
 
        LDFLAGS1="-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
117
 
 
118
 
        VERSION="${PYTHON_VERSION}"
119
 
        STRING="${PYTHONFRAMEWORKDIR}/Versions/${VERSION}/${PYTHONFRAMEWORK}"
120
 
        LDFLAGS2=`${PYTHON} -c "from sys import stdout; \
121
 
            from distutils import sysconfig; \
122
 
            stdout.write(sysconfig.get_config_var(
123
 
            \"LINKFORSHARED\").replace(\"${STRING}\", ''))"`
124
 
 
125
 
        LDLIBS1=`${PYTHON} -c 'from sys import stdout; \
126
 
            from distutils import sysconfig; \
127
 
            stdout.write(sysconfig.get_config_var("LIBS"))'`
128
 
    fi
 
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"))'`
129
141
fi
130
142
 
131
143
CFLAGS=""
141
153
LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
142
154
LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
143
155
 
144
 
#LDFLAGS=`echo ${LDFLAGS} | \
145
 
# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
146
 
#LDLIBS=`echo ${LDLIBS} | \
147
 
# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
148
 
 
149
156
AC_SUBST(CFLAGS)
150
157
AC_SUBST(LDFLAGS)
151
158
AC_SUBST(LDLIBS)