Author: Tzafrir Cohen <tzafrir@debian.org>
Description: minor fixes to fix newer versions of autoconf
Index: h323plus-1.24.0~dfsg/plugins/configure.ac
===================================================================
--- h323plus-1.24.0~dfsg.orig/plugins/configure.ac	2010-09-20 19:04:24.000000000 +1000
+++ h323plus-1.24.0~dfsg/plugins/configure.ac	2012-03-17 08:09:03.000000000 +1100
@@ -474,7 +474,7 @@
                   )
                   ],
   AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_POSIX_MEMALIGN, 1),
+  AC_DEFINE(HAVE_POSIX_MEMALIGN, 1, [POSIX memalign() support]),
   AC_MSG_RESULT(no)
 )
 AC_LANG_POP([C++])
Index: h323plus-1.24.0~dfsg/configure.ac
===================================================================
--- h323plus-1.24.0~dfsg.orig/configure.ac	2012-02-01 00:02:29.000000000 +1100
+++ h323plus-1.24.0~dfsg/configure.ac	2012-03-17 08:24:18.000000000 +1100
@@ -56,10 +56,10 @@
 
 echo "OpenH323 version is ${OPENH323_VERSION}"
 
-AC_DEFINE_UNQUOTED(OPENH323_MAJOR,   ${MAJOR_VERSION})
-AC_DEFINE_UNQUOTED(OPENH323_MINOR,   ${MINOR_VERSION})
-AC_DEFINE_UNQUOTED(OPENH323_BUILD,   ${BUILD_NUMBER})
-AC_DEFINE_UNQUOTED(OPENH323_VERSION, "$OPENH323_VERSION")
+AC_DEFINE_UNQUOTED(OPENH323_MAJOR,   ${MAJOR_VERSION}, [Major version])
+AC_DEFINE_UNQUOTED(OPENH323_MINOR,   ${MINOR_VERSION}, [Minor version])
+AC_DEFINE_UNQUOTED(OPENH323_BUILD,   ${BUILD_NUMBER},  [Build number])
+AC_DEFINE_UNQUOTED(OPENH323_VERSION, "$OPENH323_VERSION", [Full version number])
 
 dnl ########################################################################
 dnl look for ptlib, use a preference order of explicit PTLIBDIR, directory
@@ -247,7 +247,7 @@
   AC_MSG_NOTICE(Disabling audio functions)
   AC_SUBST(NOAUDIOCODECS, 1)
 else
-  AC_DEFINE(H323_AUDIO_CODECS, 1)
+  AC_DEFINE(H323_AUDIO_CODECS, 1, [Include audio codecs])
 
   AC_ARG_ENABLE(embeddedgsm,
          [  --enable-embeddedgsm    embed GSM codec via static linking],
@@ -260,7 +260,7 @@
     if test "x$GSM" != "x"; then
       ENDLDLIBS="$ENDLDLIBS -lgsm"
     fi
-    AC_DEFINE(H323_EMBEDDED_GSM)
+    AC_DEFINE(H323_EMBEDDED_GSM, , [Use embdedded GSM codec])
   fi
 fi
 
@@ -281,7 +281,7 @@
   AC_MSG_NOTICE(Disabling video functions)
   AC_SUBST(NOVIDEO, 1)
 else
-  AC_DEFINE(H323_VIDEO, 1)
+  AC_DEFINE(H323_VIDEO, 1, [Enable H.323 video support])
 fi
 
 dnl ########################################################################
@@ -297,7 +297,7 @@
 fi
 if test "$enable_h224" = "yes" ; then
   H323_H224=1
-  AC_DEFINE(H323_H224, 1)
+  AC_DEFINE(H323_H224, 1, [Enable H.244 support])
 else
   H323_H224=
   AC_MSG_NOTICE(Disabling H.224)
@@ -317,7 +317,7 @@
 fi
 if test "$enable_h230" = "yes" ; then
   H323_H230=1
-  AC_DEFINE(H323_H230, 1)
+  AC_DEFINE(H323_H230, 1, [Enable H.230 support])
 else
   H323_H230=
   AC_MSG_NOTICE(Disabling H.230)
@@ -337,7 +337,7 @@
 fi
 if test "$enable_h235" = "yes" ; then
   H323_H235=1
-  AC_DEFINE(H323_H235, 1)
+  AC_DEFINE(H323_H235, 1, [Enable H.235 support])
 else
   H323_H235=
   AC_MSG_NOTICE(Disabling H.235.6)
@@ -357,7 +357,7 @@
 fi
 if test "$enable_h239" = "yes" ; then
   H323_H239=1
-  AC_DEFINE(H323_H239, 1)
+  AC_DEFINE(H323_H239, 1, [Enable H.239 support])
 else
   H323_H239=
   AC_MSG_NOTICE(Disabling H.239)
@@ -377,7 +377,7 @@
 fi
 if test "$enable_h248" = "yes" ; then
   H323_H248=1
-  AC_DEFINE(H323_H248, 1)
+  AC_DEFINE(H323_H248, 1, [Enable H.248 support])
 else
   H323_H248=
   AC_MSG_NOTICE(Disabling H.248)
@@ -397,7 +397,7 @@
 fi
 if test "$enable_h249" = "yes" ; then
   H323_H249=1
-  AC_DEFINE(H323_H249, 1)
+  AC_DEFINE(H323_H249, 1, [Enable H.249 support])
 else
   H323_H249=
   AC_MSG_NOTICE(Disabling H.249)
@@ -417,7 +417,7 @@
 fi
 if test "$enable_h341" = "yes" ; then
   H323_H341=1
-  AC_DEFINE(H323_H341, 1)
+  AC_DEFINE(H323_H341, 1, [Enable H.341 support])
 else
   H323_H341=
   AC_MSG_NOTICE(Disabling H.341)
@@ -437,7 +437,7 @@
 fi
 if test "$enable_h350" = "yes" ; then
   H323_H350=1
-  AC_DEFINE(H323_H350, 1)
+  AC_DEFINE(H323_H350, 1, [Enable H.350 support])
 else
   H323_H350=
   AC_MSG_NOTICE(Disabling H.350)
@@ -457,7 +457,7 @@
 fi
 if test "$enable_h450" = "yes" ; then
   H323_H450=1
-  AC_DEFINE(H323_H450, 1)
+  AC_DEFINE(H323_H450, 1, [Enable H.450 support])
 else
   H323_H450=
   AC_MSG_NOTICE(Disabling H.450)
@@ -477,7 +477,7 @@
 fi
 if test "$enable_h460" = "yes" ; then
   H323_H460=1
-  AC_DEFINE(H323_H460, 1)
+  AC_DEFINE(H323_H460, 1, [Enable H.460 support])
 else
   H323_H460=
   AC_MSG_NOTICE(Disabling H.460)
@@ -497,7 +497,7 @@
 fi
 if test "$enable_h4609" = "yes" ; then
   H323_h4609=1
-  AC_DEFINE(H323_H4609, 1)
+  AC_DEFINE(H323_h4609, 1, [Enable H.490 support])
 else
   H323_h4609=
   AC_MSG_NOTICE(Disabling H.460.9)
@@ -517,7 +517,7 @@
 fi
 if test "$enable_h46017" = "yes" ; then
   H323_H46017=1
-  AC_DEFINE(H323_H46017, 1)
+  AC_DEFINE(H323_H46017, 1, [Enable H.460.17 support])
 else
   H323_H46017=
   AC_MSG_NOTICE(Disabling H.460.17)
@@ -537,7 +537,7 @@
 fi
 if test "$enable_h46018" = "yes" ; then
   H323_H46018=1
-  AC_DEFINE(H323_H46018, 1)
+  AC_DEFINE(H323_H46018, 1, [Enable H.460.18/.19 support])
 else
   H323_H46018=
   AC_MSG_NOTICE(Disabling H.460.18/.19)
@@ -557,7 +557,7 @@
 fi
 if test "$enable_h46019m" = "yes" ; then
   H323_H46019M=1
-  AC_DEFINE(H323_H46019M, 1)
+  AC_DEFINE(H323_H46019M, 1, [Enable H.460.19 support])
 else
   H323_H46019M=
   AC_MSG_NOTICE(Disabling H.460.19 RTP multiplexing)
@@ -577,7 +577,7 @@
 fi
 if test "$enable_h46023" = "yes" ; then
   H323_H46023=1
-  AC_DEFINE(H323_H46023, 1)
+  AC_DEFINE(H323_H46023, 1, [Enable H.460.23 support])
 else
   H323_H46023=
   AC_MSG_NOTICE(Disabling H.460.23/.24)
@@ -597,7 +597,7 @@
 fi
 if test "$enable_h460p" = "yes" ; then
   H323_H460P=1
-  AC_DEFINE(H323_H460P, 1)
+  AC_DEFINE(H323_H460P, 1, [Enable H.460P support])
 else
   H323_H460P=
   AC_MSG_NOTICE(Disabling H.460 Presence)
@@ -617,7 +617,7 @@
 fi
 if test "$enable_h501" = "yes" ; then
   H323_H501=1
-  AC_DEFINE(H323_H501, 1)
+  AC_DEFINE(H323_H501, 1, [Enable H.501 support])
 else
   H323_H501=
   AC_MSG_NOTICE(Disabling H.501)
@@ -638,7 +638,7 @@
 if test "$enable_t38" = "yes" ; then
   AC_MSG_NOTICE(Enabling T.38)
   H323_T38=1
-  AC_DEFINE(H323_T38, 1)
+  AC_DEFINE(H323_T38, 1, [Enable T.38 support])
 else
   H323_T38=
   AC_MSG_NOTICE(Disabling T.38)
@@ -661,7 +661,7 @@
   AC_MSG_NOTICE(Disabling T.120)
 else
   H323_T20=1
-  AC_DEFINE(H323_T120, 1)
+  AC_DEFINE(H323_T120, 1, [Enable T.120 support])
 fi
 AC_SUBST(H323_T120)
 
@@ -678,7 +678,7 @@
 fi
 if test "$enable_gnugk" = "yes" ; then
   H323_GNUGK=1
-  AC_DEFINE(H323_GNUGK, 1)
+  AC_DEFINE(H323_GNUGK, 1, [Enable GNU GateKeeper NAT support])
 else
   H323_GNUGK=
   AC_MSG_NOTICE(Disabling GnuGk NAT)
@@ -698,7 +698,7 @@
 fi
 if test "$enable_file" = "yes" ; then
   H323_FILE=1
-  AC_DEFINE(H323_FILE, 1)
+  AC_DEFINE(H323_FILE, 1, [Enable H323 file support])
 else
   H323_FILE=
   AC_MSG_NOTICE(Disabling File Transfer)
@@ -741,7 +741,7 @@
                  [upad128_t upad; upad._q = 0.0;], has_upad128_t=y)
   if test ${has_upad128_t} == "y"; then
     AC_MSG_RESULT(yes)
-    AC_DEFINE(P_HAS_UPAD128_T)
+    AC_DEFINE(P_HAS_UPAD128_T, ,[type upad128_t available])
   else
     AC_MSG_RESULT(no)
   fi
