Use configure to determine the prefixes and include directories properly.

This ensures cross-platform compatibility, even among Linux distributions,
which don't always put headers in the same place.

(closes issue #17391)
 Reported by: loloski


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@265747 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 84 insertions, 81 deletions

diff --git a/configure b/configure
index 025b34b81..fc1b6cc96 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 263905 .
+# From configure.ac Revision: 264249 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -25378,6 +25378,7 @@ fi
 
 
 
+# Some distributions (like RedHat) add a libical subdirectory for the headers
 
 if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then
    pbxlibdir=""
@@ -25389,7 +25390,7 @@ if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then
       	 pbxlibdir="-L${ICAL_DIR}"
       fi
    fi
-   pbxfuncname="icaltimezone_new"
+   pbxfuncname="icaltimezone_get_utc_timezone"
    if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
       AST_ICAL_FOUND=yes
    else
@@ -25475,23 +25476,23 @@ fi
          ICAL_INCLUDE="-I${ICAL_DIR}/include"
       fi
       ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}"
-      if test "xical.h" = "x" ; then	# no header, assume found
+      if test "xlibical/ical.h" = "x" ; then	# no header, assume found
          ICAL_HEADER_FOUND="1"
       else				# check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}"
-         if test "${ac_cv_header_ical_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for ical.h" >&5
-echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ical_h+set}" = set; then
+         if test "${ac_cv_header_libical_ical_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for libical/ical.h" >&5
+echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_libical_ical_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5
-echo "${ECHO_T}$ac_cv_header_ical_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5
+echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ical.h usability" >&5
-echo $ECHO_N "checking ical.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libical/ical.h usability" >&5
+echo $ECHO_N "checking libical/ical.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25499,7 +25500,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <ical.h>
+#include <libical/ical.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -25531,15 +25532,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking ical.h presence" >&5
-echo $ECHO_N "checking ical.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking libical/ical.h presence" >&5
+echo $ECHO_N "checking libical/ical.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ical.h>
+#include <libical/ical.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -25572,25 +25573,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ical.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: libical/ical.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: ical.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ical.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ical.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ical.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ical.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ical.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ical.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ical.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ical.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ical.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ical.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: libical/ical.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: libical/ical.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: libical/ical.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libical/ical.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to www.asterisk.org ##
@@ -25599,18 +25600,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for ical.h" >&5
-echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ical_h+set}" = set; then
+{ echo "$as_me:$LINENO: checking for libical/ical.h" >&5
+echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_libical_ical_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_header_ical_h=$ac_header_preproc
+  ac_cv_header_libical_ical_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5
-echo "${ECHO_T}$ac_cv_header_ical_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5
+echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; }
 
 fi
-if test $ac_cv_header_ical_h = yes; then
+if test $ac_cv_header_libical_ical_h = yes; then
   ICAL_HEADER_FOUND=1
 else
   ICAL_HEADER_FOUND=0
@@ -25636,8 +25637,10 @@ _ACEOF
 fi
 
 
+if test x"${PBX_ICAL}" = x1; then
+	ICAL_INCLUDE+=-I/usr/include/libical
+fi
 
-# Some distributions (like RedHat) add a libical subdirectory for the headers
 
 if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then
    pbxlibdir=""
@@ -25649,7 +25652,7 @@ if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then
       	 pbxlibdir="-L${ICAL_DIR}"
       fi
    fi
-   pbxfuncname="icaltimezone_get_utc_timezone"
+   pbxfuncname="icaltimezone_new"
    if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
       AST_ICAL_FOUND=yes
    else
@@ -25735,23 +25738,23 @@ fi
          ICAL_INCLUDE="-I${ICAL_DIR}/include"
       fi
       ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}"
-      if test "xlibical/ical.h" = "x" ; then	# no header, assume found
+      if test "xical.h" = "x" ; then	# no header, assume found
          ICAL_HEADER_FOUND="1"
       else				# check for the header
          ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
          CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}"
-         if test "${ac_cv_header_libical_ical_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for libical/ical.h" >&5
-echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_libical_ical_h+set}" = set; then
+         if test "${ac_cv_header_ical_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for ical.h" >&5
+echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ical_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5
-echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5
+echo "${ECHO_T}$ac_cv_header_ical_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking libical/ical.h usability" >&5
-echo $ECHO_N "checking libical/ical.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ical.h usability" >&5
+echo $ECHO_N "checking ical.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -25759,7 +25762,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <libical/ical.h>
+#include <ical.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -25791,15 +25794,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking libical/ical.h presence" >&5
-echo $ECHO_N "checking libical/ical.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ical.h presence" >&5
+echo $ECHO_N "checking ical.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <libical/ical.h>
+#include <ical.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -25832,25 +25835,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libical/ical.h: proceeding with the compiler's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ical.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libical/ical.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libical/ical.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libical/ical.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libical/ical.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ical.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ical.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ical.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ical.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ical.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: ical.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ical.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ------------------------------- ##
 ## Report this to www.asterisk.org ##
@@ -25859,18 +25862,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for libical/ical.h" >&5
-echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_libical_ical_h+set}" = set; then
+{ echo "$as_me:$LINENO: checking for ical.h" >&5
+echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ical_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_header_libical_ical_h=$ac_header_preproc
+  ac_cv_header_ical_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5
-echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5
+echo "${ECHO_T}$ac_cv_header_ical_h" >&6; }
 
 fi
-if test $ac_cv_header_libical_ical_h = yes; then
+if test $ac_cv_header_ical_h = yes; then
   ICAL_HEADER_FOUND=1
 else
   ICAL_HEADER_FOUND=0
@@ -40590,11 +40593,11 @@ fi
 
 
 if test "x${PBX_LUA}" = "x1" ; then
-
-cat >>confdefs.h <<_ACEOF
-#define LUA51_PREFIX 1
-_ACEOF
-
+	if test x"${LUA_DIR}" = x; then
+		LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1"
+	else
+		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
+	fi
 fi
 
 # Some distributions (like SuSE) remove the 5.1 suffix.