massive rework of configure script, and split of AST_EXT_LIB into separate macros, reducing code duplication

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

makeopts.in

@@ -42,11 +42,11 @@ sysconfdir = @sysconfdir@
 
 AST_DEVMODE=@AST_DEVMODE@
 
-LIBOGG_LIB=@OGG_LIB@
-LIBOGG_INCLUDE=@OGG_INCLUDE@
+OGG_LIB=@OGG_LIB@
+OGG_INCLUDE=@OGG_INCLUDE@
 
-LIBVORBIS_LIB=@VORBIS_LIB@
-LIBVORBIS_INCLUDE=@VORBIS_INCLUDE@
+VORBIS_LIB=@VORBIS_LIB@
+VORBIS_INCLUDE=@VORBIS_INCLUDE@
 
 ASOUND_LIB=@ALSA_LIB@
 ASOUND_INCLUDE=@ALSA_INCLUDE@
@@ -57,8 +57,8 @@ NBS_INCLUDE=@NBS_INCLUDE@
 OSSAUDIO_LIB=@OSS_LIB@
 OSSAUDIO_INCLUDE=@OSS_INCLUDE@
 
-LIBSPEEX_LIB=@SPEEX_LIB@
-LIBSPEEX_INCLUDE=@SPEEX_INCLUDE@
+SPEEX_LIB=@SPEEX_LIB@
+SPEEX_INCLUDE=@SPEEX_INCLUDE@
 
 TONEZONE_LIB=@TONEZONE_LIB@
 TONEZONE_INCLUDE=@TONEZONE_INCLUDE@
@@ -68,17 +68,17 @@ ZAPTEL_INCLUDE=@ZAPTEL_INCLUDE@
 VPBAPI_LIB=@VPB_LIB@
 VPBAPI_INCLUDE=@VPB_INCLUDE@
 
-LIBPRI_LIB=@LIBPRI_LIB@
-LIBPRI_INCLUDE=@LIBPRI_INCLUDE@
+PRI_LIB=@PRI_LIB@
+PRI_INCLUDE=@PRI_INCLUDE@
 
-LIBOSPTK_LIB=@OSPTK_LIB@
-LIBOSPTK_INCLUDE=@OSPTK_INCLUDE@
+OSPTK_LIB=@OSPTK_LIB@
+OSPTK_INCLUDE=@OSPTK_INCLUDE@
 
 UNIXODBC_LIB=@UNIXODBC_LIB@
 UNIXODBC_INCLUDE=@UNIXODBC_INCLUDE@
 
-PGSQL_LIB=@pq_LIB@
-PGSQL_INCLUDE=@pq_INCLUDE@
+PGSQL_LIB=@PGSQL_LIB@
+PGSQL_INCLUDE=@PGSQL_INCLUDE@
 
 SQLITE_LIB=@SQLITE_LIB@
 SQLITE_INCLUDE=@SQLITE_INCLUDE@
@@ -116,8 +116,8 @@ GTK_LIB=@GTK_LIB@
 
 CURL_LIB=@CURLLIB@
 
-LIBGSM_LIB=@gsm_LIB@
-LIBGSM_INCLUDE=@gsm_INCLUDE@
+GSM_LIB=@GSM_LIB@
+GSM_INCLUDE=@GSM_INCLUDE@
 
 CURSES_LIB=@CURSES_LIB@
 CURSES_INCLUDE=@CURSES_INCLUDE@
@@ -127,7 +127,10 @@ NCURSES_INCLUDE=@NCURSES_INCLUDE@
 
 EDITLINE_LIB=@EDITLINE_LIB@
 
-RADIUSCLIENT_LIB=@RADIUSCLIENT_LIB@
-RADIUSCLIENT_INCLUDE=@RADIUSCLIENT_INCLUDE@
+RADIUS_LIB=@RADIUS_LIB@
+RADIUS_INCLUDE=@RADIUS_INCLUDE@
 
 NETSNMP_LIB=@NETSNMP_LIB@
+
+IMAP_TK_LIB=@IMAP_TK_LIB@
+IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@