X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=f386b52ed3ee9682f57505d6fac45490dcc71f2d;hb=863691e01b76c0788bd93f37aedc4d8b36465d09;hp=579a10549fd6296cd3e28f7cf8a2b9e9bc057f43;hpb=587f690ff0ba0ec6b91bd4b83fa39305120e8e93;p=oweals%2Fopkg-lede.git

diff --git a/configure.ac b/configure.ac
index 579a105..f386b52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,29 @@
 # Process this file with autoconf to produce a configure script
-AC_INIT(libopkg/libopkg.c)
+AC_INIT([opkg], [0.1.8])
+AC_CONFIG_SRCDIR([libopkg/pkg.c])
 
 AC_CONFIG_AUX_DIR([conf])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([shave])
 
-AM_INIT_AUTOMAKE([opkg], [0.1.6])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(libopkg/config.h)
 
 AC_CANONICAL_HOST
 AC_GNU_SOURCE 
 
+# Disable C++/Fortran checks
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
+
 
 for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do
   test -f $top_builddir/configure && break
 done
 
+# large file support can be useful for gpgme
+AC_SYS_LARGEFILE
+
 
 # Checks for programs
 AC_PROG_AWK
@@ -23,9 +32,26 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PROG_INSTALL_STRIP
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG([0.20])
 
 # Checks for libraries
 
+dnl extra argument: --enable-pathfinder
+AC_ARG_ENABLE(pathfinder,
+              AC_HELP_STRING([--enable-pathfinder], [Enable libpathfinder support.
+      [[default=no]] ]),
+    [want_pathfinder="$enableval"], [want_pathfinder="no"])
+dnl Check for libpathfinder
+if test "x$want_pathfinder" = "xyes"; then
+  PKG_CHECK_MODULES([PATHFINDER], [pathfinder-openssl dbus-1 openssl])
+  if test -n "$PATHFINDER_CFLAGS$PATHFINDER_LIBS"; then
+    AC_DEFINE(HAVE_PATHFINDER, 1, [we have pathfinder])
+  fi
+  AC_SUBST(PATHFINDER_CFLAGS)
+  AC_SUBST(PATHFINDER_LIBS)
+fi
+AM_CONDITIONAL(HAVE_PATHFINDER, test "x$want_pathfinder" = "xyes")
+
 # check for libcurl
 AC_ARG_ENABLE(curl,
               AC_HELP_STRING([--enable-curl], [Enable downloading with curl
@@ -33,7 +59,7 @@ AC_ARG_ENABLE(curl,
     [want_curl="$enableval"], [want_curl="yes"])
 
 if test "x$want_curl" = "xyes"; then
-  PKG_CHECK_MODULES(CURL, libcurl)
+  PKG_CHECK_MODULES(CURL, [libcurl])
   AC_DEFINE(HAVE_CURL, 1, [Define if you want CURL support])
 fi
 
@@ -55,8 +81,44 @@ AC_ARG_ENABLE(openssl,
     [want_openssl="$enableval"], [want_openssl="no"])
 
 if test "x$want_openssl" = "xyes"; then
-  PKG_CHECK_MODULES(OPENSSL, openssl)
   AC_DEFINE(HAVE_OPENSSL, 1, [Define if you want OpenSSL support])
+  NEED_SSL_LIBS="yes"
+fi
+
+# check for libssl-curl
+AC_ARG_ENABLE(ssl-curl,
+              AC_HELP_STRING([--enable-ssl-curl], [Enable certificate authentication with curl
+                              [[default="yes"]] ]),
+                              [want_sslcurl="$enableval"], [want_sslcurl="yes"])
+
+if test "x$want_curl" = "xyes" -a "x$want_sslcurl" = "xyes"; then
+  AC_DEFINE(HAVE_CURL, 1, [Define if you want CURL support])
+  AC_DEFINE(HAVE_SSLCURL, 1, [Define if you want certificate authentication with curl])
+  NEED_SSL_LIBS="yes"
+fi
+
+if test "x$NEED_SSL_LIBS" = "xyes"; then
+  AC_MSG_CHECKING([if openssl is available])
+
+  PKG_CHECK_MODULES(OPENSSL, openssl, [:], [:])
+  if test "x$OPENSSL_LIBS" != "x"; then
+          AC_MSG_RESULT(yes)
+  else
+          OPENSSL_LIBS="-lcrypto -lssl"
+          dnl If pkg-config fails, run compile/link test.
+          AC_TRY_LINK([
+#include <openssl/opensslv.h>
+], [
+return OPENSSL_VERSION_NUMBER; ],
+          [
+            AC_MSG_RESULT(yes)
+
+          ], [
+            AC_MSG_RESULT(no)
+            AC_MSG_ERROR(OpenSSL not found)
+          ])
+  fi
+  AC_SUBST(OPENSSL_LIBS)
 fi
 
 
@@ -163,13 +225,13 @@ if test x$opkglibdir = x; then
         opkglibdir=/usr/lib
 fi
 
-ipkgetcdir=
+opkgetcdir=
 AC_ARG_WITH(opkgetcdir,
-[  --with-ipkgetcdir=DIR   specifies directory for opkg.conf file,
+[  --with-opkgetcdir=DIR   specifies directory for opkg.conf file,
                            "/opkg" is always added so if you want your files
                            to be in /usr/etc/opkg instead of /etc/opkg
                            you should indicate
-                           --with-ipkgetcdir=/usr/etc ],
+                           --with-opkgetcdir=/usr/etc ],
 [case "${withval}" in
 yes)    AC_MSG_ERROR(bad value ${withval} given for opkg.conf directory ) ;;
 no)     ;;
@@ -181,6 +243,22 @@ if test x$opkgetcdir = x; then
         opkgetcdir=/etc
 fi
 
+opkglockfile=
+AC_ARG_WITH(opkglockfile,
+[  --with-opkglockfile=FILE specifies the file used to make sure there is only
+                           one instance of opkg runnning.
+                           Defaults to ${opkglibdir}/opkg/lock, i.e.
+                           /usr/lib/opkg/lock ],
+[case "${withval}" in
+yes)    AC_MSG_ERROR(bad value ${withval} given for opkg lock file ) ;;
+no)     ;;
+*)      opkglockfile=$with_opkglockfile ;;
+esac])
+
+# Default if empty
+if test x$opkglockfile = x; then
+        opkglockfile=${opkglibdir}/opkg/lock
+fi
 
 dnl Some special cases for the wow64 build
 if test "x$want_gpgme" = "xyes"
@@ -196,6 +274,10 @@ fi
 
 AC_SUBST(opkglibdir)
 AC_SUBST(opkgetcdir)
+AC_SUBST(opkglockfile)
+
+# Setup output beautifier.
+SHAVE_INIT([shave], [enable])
 
 AC_OUTPUT(
     Makefile
@@ -204,5 +286,8 @@ AC_OUTPUT(
     src/Makefile
     libbb/Makefile
     utils/Makefile
+    utils/update-alternatives
     libopkg.pc
+    shave/shave
+    shave/shave-libtool
     )