Changeset 3158 for pjproject/trunk/aconfigure.ac

Timestamp:

May 1, 2010 10:05:41 PM (15 years ago)

Author:

bennylp

Message:

Fixed #1064:

• Removed orphaned third_party/gsm/inc/gsm.h.orig file
• Added support for external GSM header in /usr/include/gsm.h (rather than <gsm/gsm.h>)

Thanks Christopher Zimmermann for the fixes

File:

• pjproject/trunk/aconfigure.ac (modified) (1 diff)

pjproject/trunk/aconfigure.ac

@@ -409 +409 @@
     [
         if test "x$with_external_gsm" != "xno"; then
-                # Test GSM library installation
-                AC_MSG_CHECKING([if external GSM devkit is installed])
-                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gsm/gsm.h>
-                                                                   ]],
-                                                                   [gsm_create(); ])
-                                                  ],
-                                          [AC_MSG_RESULT(yes!!)
-                                           AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1)
-                                           ac_external_gsm="1"
-                                          ],
-                                          [AC_MSG_ERROR([Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])])
+                # Test GSM library installation
+                AC_MSG_CHECKING([if external GSM devkit is installed as gsm/gsm.h])
+                AC_COMPILE_IFELSE(
+                    [AC_LANG_PROGRAM([[#include <gsm/gsm.h> ]], [gsm_create(); ]) ],
+                    [AC_MSG_RESULT(yes!!)
+                     AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1)
+                     AC_DEFINE(PJMEDIA_EXTERNAL_GSM_GSM_H, 1)
+                     ac_external_gsm="1"
+                    ],
+                    [
+                     AC_MSG_RESULT(no)
+                     AC_MSG_CHECKING([if external GSM devkit is installed as gsm.h])
+                     AC_COMPILE_IFELSE(
+                        [AC_LANG_PROGRAM([[#include <gsm.h> ]], [gsm_create(); ]) ],
+                        [AC_MSG_RESULT(yes!!)
+                         AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1)
+                         AC_DEFINE(PJMEDIA_EXTERNAL_GSM_H, 1)
+                         ac_external_gsm="1"
+                        ],
+                        [AC_MSG_ERROR([Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])
+                        ]
+                     )
+                    ]
+                )
         fi
     ]