MT#7955 Make pcre deps compile/link correctly.

12 years ago · 20815b2bed
parent 636153f5bc
commit 20815b2bed
7 changed files with 14478 additions and 36449 deletions
--- a/apps/Makefile
+++ b/apps/Makefile
@ -27,7 +27,6 @@ ifneq ($(findstring apps,$(MENUSELECT_EMBED)),)
  LOADABLE_MODS:=
 endif

-MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_PCRE)
 MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
 ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
 MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@ -31,19 +31,18 @@
 /*** MODULEINFO
 	<depend>res_adsi</depend>
 	<depend>res_smdi</depend>
+	<depend>pcre</depend>
 ***/

 /*** MAKEOPTS
 <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_directory.o">
 	<member name="ODBC_STORAGE" displayname="Storage of Voicemail using ODBC">
-		<depend>pcre</depend>
 		<depend>unixodbc</depend>
 		<depend>ltdl</depend>
 		<conflict>IMAP_STORAGE</conflict>
 		<defaultenabled>yes</defaultenabled>
 	</member>
 	<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
-		<depend>pcre</depend>
 		<depend>imap_tk</depend>
 		<conflict>ODBC_STORAGE</conflict>
 		<use>ssl</use>
@ -403,7 +402,10 @@ struct vm_state {
 	struct vm_state *persist_vms;
 #endif
 };
+
+#ifdef ODBC_STORAGE
 static struct ast_vm_user *find_user_realtime_by_alias(struct ast_vm_user *ivm, const char *context, const char *alias);
+#endif
 static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, int msg, int option, signed char record_gain);
 static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, char *outgoing_context);
 static int play_record_review(struct ast_channel *chan, char *playfile, char *recordfile, int maxtime,
@ -930,9 +932,12 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, const char *contex
 	 {
 		ast_log (LOG_DEBUG,"call find_user_realtime for '%s@%s'\n", mailbox, context);

-		// vmu = find_user_realtime(ivm, context, mailbox);
 		// agranig: always find user by alias
+#ifdef ODBC_STORAGE
 		vmu = find_user_realtime_by_alias(ivm, context, mailbox);
+#else
+		vmu = find_user_realtime(ivm, context, mailbox);
+#endif
 	 }
 	AST_LIST_UNLOCK(&users);
 	return vmu;
@ -2925,6 +2930,7 @@ static void rename_file(char *sfn, char *dfn)
 }
 #endif

+
 /*
 * A negative return value indicates an error.
 */
@ -5102,6 +5108,7 @@ static int get_folder2(struct ast_channel *chan, char *fn, int start)
 	return res;
 }

+#if 0
 static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu, char *curdir, int curmsg, char *vmfmts,
 			     char *context, signed char record_gain, long *duration, struct vm_state *vms)
 {
@ -5203,6 +5210,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
 		cmd = 0;
 	return cmd;
 }
+#endif

 static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, int msgnum, long duration, char *fmt, char *cidnum, char *cidname)
 {
@ -5264,6 +5272,7 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu,
 	return 0;
 }

+#if 0
 static int forward_message(struct ast_channel *chan, char *context, struct vm_state *vms, struct ast_vm_user *sender, char *fmt, int flag, signed char record_gain)
 {
 #ifdef IMAP_STORAGE
@ -5485,6 +5494,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
 		free_user(vmtmp);
 	return res ? res : cmd;
 }
+#endif

 static int wait_file2(struct ast_channel *chan, struct vm_state *vms, char *file)
 {
--- a/apps/app_voicemail.c.orig
+++ b/apps/app_voicemail.c.orig
--- a/build_tools/menuselect-deps.in
+++ b/build_tools/menuselect-deps.in
@ -31,6 +31,7 @@ SSL=@PBX_OPENSSL@
 TONEZONE=@PBX_TONEZONE@
 USB=@PBX_USB@
 UNIXODBC=@PBX_UNIXODBC@
+PCRE=@PBX_PCRE@
 VORBIS=@PBX_VORBIS@
 VPBAPI=@PBX_VPB@
 ZAPTEL=@PBX_ZAPTEL@
--- a/41567
+++ b/41567
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@ -277,6 +277,9 @@
 /* Define to 1 if OSX atomic operations are supported. */
 #undef HAVE_OSX_ATOMICS

+/* Define to indicate the ${PCRE_DESCRIP} library */
+#undef HAVE_PCRE
+
 /* Define to indicate the PostgreSQL library */
 #undef HAVE_PGSQL

@ -445,7 +448,7 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ

-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE

 /* Define to indicate the ${SUPPSERV_DESCRIP} library */
@ -583,12 +586,12 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME

+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION

-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* Define to necessary symbol if this constant uses a non-standard name on
   your system. */
 #undef PTHREAD_CREATE_JOINABLE
@ -605,11 +608,6 @@
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5

-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
-
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT

@ -630,20 +628,35 @@
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME

-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS

 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
@ -661,20 +674,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE

-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

--- a/makeopts.in
+++ b/makeopts.in
@ -160,6 +160,9 @@ USB_LIB=@USB_LIB@
 UNIXODBC_INCLUDE=@UNIXODBC_INCLUDE@
 UNIXODBC_LIB=@UNIXODBC_LIB@

+PCRE_INCLUDE=@PCRE_INCLUDE@
+PCRE_LIB=@PCRE_LIB@
+
 VORBIS_INCLUDE=@VORBIS_INCLUDE@
 VORBIS_LIB=@VORBIS_LIB@