Bläddra i källkod

Switch CA_BUNDLE to AC_DEFINE

Nils Maier 12 år sedan
förälder
incheckning
a982dee961
3 ändrade filer med 8 tillägg och 3 borttagningar
  1. 3 2
      configure.ac
  2. 1 1
      src/Makefile.am
  3. 4 0
      src/OptionHandlerFactory.cc

+ 3 - 2
configure.ac

@@ -52,7 +52,9 @@ ARIA2_ARG_ENABLE([libaria2])
 
 AC_ARG_WITH([ca-bundle],
   AS_HELP_STRING([--with-ca-bundle=FILE],[Use FILE as default CA bundle.]),
-  [ca_bundle=$withval], [ca_bundle=""])
+  [AC_DEFINE_UNQUOTED([CA_BUNDLE], ["$withval"], [Define to choose default CA bundle.])
+   ca_bundle=$withval
+  ], [])
 
 AC_ARG_WITH([disk-cache],
   AS_HELP_STRING([--with-disk-cache=SIZE],[Use SIZE as the default disk-cache size.]),
@@ -405,7 +407,6 @@ if test "x$have_appletls" = "xyes" || test "x$have_libgnutls" = "xyes" || test "
   have_ssl="yes"
   AC_DEFINE([ENABLE_SSL], [1], [Define to 1 if ssl support is enabled.])
   AM_CONDITIONAL([ENABLE_SSL], true)
-  AC_SUBST([ca_bundle])
 else
   AM_CONDITIONAL([ENABLE_SSL], false)
 fi

+ 1 - 1
src/Makefile.am

@@ -671,4 +671,4 @@ LDADD = libaria2.la @LIBINTL@ @ALLOCA@ #-lprofiler
 AM_CPPFLAGS =  -Wall\
 	-I$(top_srcdir)/lib -I$(top_srcdir)/intl\
 	-I$(srcdir)/includes -I$(builddir)/includes\
-	-DLOCALEDIR=\"@localedir@\" -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg
+	-DLOCALEDIR=\"@localedir@\" @DEFS@ #-pg

+ 4 - 0
src/OptionHandlerFactory.cc

@@ -1144,7 +1144,11 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers()
     OptionHandler* op(new DefaultOptionHandler
                       (PREF_CA_CERTIFICATE,
                        TEXT_CA_CERTIFICATE,
+#ifdef CA_BUNDLE
                        CA_BUNDLE,
+#else
+                       "",
+#endif
                        PATH_TO_FILE));
     op->addTag(TAG_HTTP);
     op->addTag(TAG_HTTPS);