s/ipkgetcdir/opkgetcdir/

[oweals/opkg-lede.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1dbd369729326d7a86a8c4bac47a6b4f3dee2965..f386b52ed3ee9682f57505d6fac45490dcc71f2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,12 @@
 # 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.7])
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(libopkg/config.h)
 
 AC_CANONICAL_HOST
@@ -224,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)     ;;
@@ -242,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"
@@ -257,6 +274,7 @@ fi
 
 AC_SUBST(opkglibdir)
 AC_SUBST(opkgetcdir)
+AC_SUBST(opkglockfile)
 
 # Setup output beautifier.
 SHAVE_INIT([shave], [enable])