Make sure the configs on OpenBSD are in /etc/asterisk by default

(closes issue #13641)
Reported by: jtodd

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@147306 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index f4f4ae8..6787af6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 146738 .
+# From configure.ac Revision: 146925 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -4053,12 +4053,24 @@ _ACEOF
        # note- does not work on FreeBSD
 
 case "${host_os}" in
-     freebsd*|openbsd*)
+     freebsd*)
      ac_default_prefix=/usr/local
      CPPFLAGS=-I/usr/local/include
      LDFLAGS=-L/usr/local/lib
      ;;
-
+     openbsd*)
+     ac_default_prefix=/usr/local
+     if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
+        if test ${sysconfdir} = '${prefix}/etc'; then
+           sysconfdir=/etc
+        fi
+        if test ${mandir} = '${prefix}/man'; then
+           mandir=/usr/share/man
+        fi
+     fi
+     CPPFLAGS=-I/usr/local/include
+     LDFLAGS=-L/usr/local/lib
+     ;;
      *)
      ac_default_prefix=/usr
      if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then

diff --git a/configure.ac b/configure.ac
index ac0588f..a4ff93c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,12 +27,24 @@ AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS       # note- does not work on FreeBSD
 
 case "${host_os}" in
-     freebsd*|openbsd*)
+     freebsd*)
      ac_default_prefix=/usr/local
      CPPFLAGS=-I/usr/local/include
      LDFLAGS=-L/usr/local/lib
      ;;
-
+     openbsd*)
+     ac_default_prefix=/usr/local
+     if test ${prefix} = '/usr/local' || test ${prefix} = 'NONE'; then
+        if test ${sysconfdir} = '${prefix}/etc'; then
+           sysconfdir=/etc
+        fi
+        if test ${mandir} = '${prefix}/man'; then
+           mandir=/usr/share/man
+        fi
+     fi
+     CPPFLAGS=-I/usr/local/include
+     LDFLAGS=-L/usr/local/lib
+     ;;
      *)
      ac_default_prefix=/usr
      if test ${prefix} = '/usr' || test ${prefix} = 'NONE'; then