Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Side by Side Diff: configure.ac

Issue 6513009: flimflam: Add L2TP/IPsec VPN plugin (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/flimflam.git@master
Patch Set: Remove local, add params Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 AC_PREREQ(2.60) 1 AC_PREREQ(2.60)
2 AC_INIT(connman, 0.42) 2 AC_INIT(connman, 0.42)
3 3
4 AM_INIT_AUTOMAKE([foreign subdir-objects]) 4 AM_INIT_AUTOMAKE([foreign subdir-objects])
5 AM_CONFIG_HEADER(config.h) 5 AM_CONFIG_HEADER(config.h)
6 6
7 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 7 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
8 8
9 AM_MAINTAINER_MODE 9 AM_MAINTAINER_MODE
10 10
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 if (test -z "${path_openvpn}"); then 149 if (test -z "${path_openvpn}"); then
150 AC_PATH_PROG(OPENVPN, [openvpn], [], $PATH:/sbin:/usr/sbin) 150 AC_PATH_PROG(OPENVPN, [openvpn], [], $PATH:/sbin:/usr/sbin)
151 else 151 else
152 OPENVPN="${path_openvpn}" 152 OPENVPN="${path_openvpn}"
153 AC_SUBST(OPENVPN) 153 AC_SUBST(OPENVPN)
154 fi 154 fi
155 fi 155 fi
156 AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no") 156 AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no")
157 AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin") 157 AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin")
158 158
159 AC_ARG_WITH(l2tpipsec, AC_HELP_STRING([--with-l2tpipsec=PROGRAM],
160 [specify location of L2TP/IPsec VPN binary]),
161 [path_l2tpipsec=${withval}])
162
163 AC_ARG_ENABLE(l2tpipsec,
164 AC_HELP_STRING([--enable-l2tpipsec], [enable L2TP/IPsec support]),
165 [enable_l2tpipsec=${enableval}],
166 [enable_l2tpipsec="no"])
167 if (test "${enable_l2tpipsec}" != "no"); then
168 if (test -z "${path_l2tpipsec}"); then
169 AC_PATH_PROG(L2TPIPSEC, [l2tpipsec_vpn], [],
170 $PATH:/sbin:/usr/sbin)
171 else
172 L2TPIPSEC="${path_l2tpipsec}"
173 AC_SUBST(L2TPIPSEC)
174 fi
175 fi
176 AM_CONDITIONAL(L2TPIPSEC, test "${enable_l2tpipsec}" != "no")
177 AM_CONDITIONAL(L2TPIPSEC_BUILTIN, test "${enable_l2tpipsec}" = "builtin")
178
159 AC_ARG_ENABLE(loopback, 179 AC_ARG_ENABLE(loopback,
160 AC_HELP_STRING([--enable-loopback], [enable loopback support]), 180 AC_HELP_STRING([--enable-loopback], [enable loopback support]),
161 [enable_loopback=${enableval}], [enable_loopback="no"]) 181 [enable_loopback=${enableval}], [enable_loopback="no"])
162 if (test "${enable_loopback}" != "no"); then 182 if (test "${enable_loopback}" != "no"); then
163 AC_CHECK_HEADERS(sys/inotify.h, dummy=yes, 183 AC_CHECK_HEADERS(sys/inotify.h, dummy=yes,
164 AC_MSG_ERROR(inotify header files are required)) 184 AC_MSG_ERROR(inotify header files are required))
165 185
166 AC_CHECK_LIB(c, inotify_init, dummy=yes, 186 AC_CHECK_LIB(c, inotify_init, dummy=yes,
167 AC_MSG_ERROR(inotify library support is required)) 187 AC_MSG_ERROR(inotify library support is required))
168 fi 188 fi
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 AC_SUBST(UDEV_LIBS) 370 AC_SUBST(UDEV_LIBS)
351 AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes") 371 AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
352 372
353 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], 373 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
354 [don't install configuration and data files]), 374 [don't install configuration and data files]),
355 [enable_datafiles=${enableval}]) 375 [enable_datafiles=${enableval}])
356 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") 376 AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no")
357 377
358 AC_OUTPUT(Makefile include/version.h src/flimflam.service 378 AC_OUTPUT(Makefile include/version.h src/flimflam.service
359 scripts/flimflam doc/version.xml flimflam.pc) 379 scripts/flimflam doc/version.xml flimflam.pc)
OLDNEW
« no previous file with comments | « Makefile.plugins ('k') | include/task.h » ('j') | plugins/l2tpipsec.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698