← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apr-util/trusty

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Ryan Niebur
  • Date: 2009-03-26 22:25:48 UTC
  • mto: (4.1.1 squeeze) (20.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20090326222548-v103269kb84vo0ub
Tags: upstream-1.3.4+dfsg
Import upstream version 1.3.4+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
15
15
sinclude(build/find_apr.m4)
16
16
sinclude(build/dbm.m4)
17
17
sinclude(build/dbd.m4)
 
18
sinclude(build/dso.m4)
18
19
 
19
20
dnl Generate ./config.nice for reproducing runs of configure
20
21
dnl 
68
69
APRUTIL_MAJOR_VERSION="`$get_version major $version_hdr APU`"
69
70
APRUTIL_DOTTED_VERSION="`$get_version all $version_hdr APU`"
70
71
 
 
72
APU_LTVERSION="-version-info `$get_version libtool $version_hdr APU`"
 
73
 
71
74
AC_SUBST(APRUTIL_DOTTED_VERSION)
72
75
AC_SUBST(APRUTIL_MAJOR_VERSION)
 
76
AC_SUBST(APU_LTVERSION)
73
77
 
74
78
echo "APR-util Version: ${APRUTIL_DOTTED_VERSION}"
75
79
 
106
110
APR_SETIFNULL(CPP, `$apr_config --cpp`)
107
111
APR_ADDTO(CFLAGS, `$apr_config --cflags`)
108
112
APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
 
113
apr_shlibpath_var=`$apr_config --shlib-path-var`
 
114
AC_SUBST(apr_shlibpath_var)
109
115
 
110
116
dnl
111
117
dnl  Find the APR-ICONV directory.
112
118
dnl
113
 
if test -d ../apr-iconv; then
114
 
  APR_SUBDIR_CONFIG(../apr-iconv,
115
 
                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
116
 
                    [--enable-layout=*|\'--enable-layout=*])
117
 
  APRUTIL_EXPORT_LIBS="$abs_srcdir/../apr-iconv/lib/libapriconv.la $APRUTIL_EXPORT_LIBS"
118
 
  APRUTIL_INCLUDES="-I$abs_srcdir/../apr-iconv/include $APRUTIL_INCLUDES"
119
 
  APR_ICONV_DIR=../apr-iconv
120
 
else
121
 
  APR_ICONV_DIR=""
122
 
fi
 
119
AC_ARG_WITH(apr-iconv,
 
120
            [  --with-apr-iconv=DIR    relative path to apr-iconv source],
 
121
  [ apu_apriconv_dir="$withval"
 
122
    if test "$apu_apriconv_dir" != "no"; then
 
123
      if test -d "$apu_apriconv_dir"; then
 
124
        APR_SUBDIR_CONFIG("$apu_apriconv_dir",
 
125
                          [$apache_apr_flags \
 
126
                             --prefix=$prefix \
 
127
                             --exec-prefix=$exec_prefix \
 
128
                             --libdir=$libdir \
 
129
                             --includedir=$includedir \
 
130
                             --bindir=$bindir \
 
131
                             --datadir=$datadir \
 
132
                             --with-installbuilddir=$installbuilddir],
 
133
                          [--enable-layout=*|\'--enable-layout=*])
 
134
        APRUTIL_EXPORT_LIBS="$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \
 
135
                             $APRUTIL_EXPORT_LIBS"
 
136
        APRUTIL_INCLUDES="-I$abs_srcdir/$apu_apriconv_dir/include \
 
137
                          $APRUTIL_INCLUDES"
 
138
        APR_ICONV_DIR="$apu_apriconv_dir"
 
139
      else
 
140
       APR_ICONV_DIR=""
 
141
      fi
 
142
    else
 
143
      APR_ICONV_DIR=""
 
144
    fi
 
145
  ])
123
146
AC_SUBST(APR_ICONV_DIR)
124
147
 
125
148
dnl Find LDAP library
132
155
APU_CHECK_DBD_MYSQL
133
156
APU_CHECK_DBD_SQLITE3
134
157
APU_CHECK_DBD_SQLITE2
 
158
APU_CHECK_DBD_ORACLE
 
159
APU_CHECK_DBD_FREETDS
 
160
APU_CHECK_DBD_ODBC
135
161
APU_FIND_EXPAT
136
162
APU_FIND_ICONV
137
163
 
 
164
dnl Enable DSO build; must be last:
 
165
APU_CHECK_UTIL_DSO
 
166
 
138
167
AC_SEARCH_LIBS(crypt, crypt ufc)
139
168
AC_MSG_CHECKING(if system crypt() function is threadsafe)
140
169
if test "x$apu_crypt_threadsafe" = "x1"; then
158
187
APRUTIL_LIBNAME="aprutil${libsuffix}"
159
188
AC_SUBST(APRUTIL_LIBNAME)
160
189
 
 
190
# Set up destination directory for DSOs.
 
191
APU_DSO_LIBDIR="\${libdir}/apr-util-${APRUTIL_MAJOR_VERSION}"
 
192
# Set APU_HAVE_MODULES appropriately for the Makefile
 
193
if test -n "$APU_MODULES"; then 
 
194
   APU_HAVE_MODULES=yes
 
195
else
 
196
   APU_HAVE_MODULES=no
 
197
fi
 
198
# Define expanded libdir for apu_config.h
 
199
APR_EXPAND_VAR(abs_dso_libdir, $APU_DSO_LIBDIR)
 
200
AC_DEFINE_UNQUOTED([APU_DSO_LIBDIR], ["$abs_dso_libdir"],
 
201
                   [Define to be absolute path to DSO directory])
 
202
AC_SUBST(APU_HAVE_MODULES)
 
203
AC_SUBST(APU_DSO_LIBDIR)
 
204
AC_SUBST(APU_MODULES)
 
205
AC_SUBST(EXTRA_OBJECTS)
 
206
 
161
207
dnl
162
208
dnl Prep all the flags and stuff for compilation and export to other builds
163
209
dnl