Changeset 4525

Timestamp:

02/08/07 00:08:02 (2 years ago)

Author:

morris

Message:

Move internal macros out of external macro

Files:

• libwired/trunk/config.m4 (modified) (2 diffs)

libwired/trunk/config.m4

@@ -127 +127 @@
-                LIBS="$LIBS -framework CoreServices -framework Carbon"
-        ])
+])
+
+
+AC_DEFUN([_WI_PTHREAD_TEST_INCLUDES], [
+        #include <pthread.h>
+        #include <errno.h>
+
+        void * thread(void *arg) {
+                return NULL;
+        }
+])
+
+
+AC_DEFUN([_WI_PTHREAD_TEST_FUNCTION], [
+        pthread_t tid;
+
+        if(pthread_create(&tid, 0, thread, NULL) < 0)
+                return errno;
+
+        return 0;
+])
+
+
+AC_DEFUN([_WI_PTHREAD_TEST_PROGRAM], [
+        _WI_PTHREAD_TEST_INCLUDES
+
+        int main(void) {
+                _WI_PTHREAD_TEST_FUNCTION
+        }
+])
+
+
+AC_DEFUN([_WI_PTHREAD_TRY], [
+        if test "$_wi_pthreads_found" != yes ; then
+                OLD_LIBS="$LIBS"
+                LIBS="$1 $LIBS"
+
+                AC_RUN_IFELSE([AC_LANG_SOURCE([_WI_PTHREAD_TEST_PROGRAM])], [
+                        _wi_pthreads_test=yes
+                ], [
+                        _wi_pthreads_test=no
+                ], [
+                        AC_LINK_IFELSE([AC_LANG_PROGRAM([_WI_PTHREAD_TEST_INCLUDES], [_WI_PTHREAD_TEST_FUNCTION])], [
+                                _wi_pthreads_test=yes
+                        ], [
+                                _wi_pthreads_test=no
+                        ])
+                ])
+
+                LIBS="$OLD_LIBS"
+
+                if test "$_wi_pthreads_test" = yes ; then
+                        _wi_pthreads_found=yes
+                        _wi_pthreads_libs="$1"
+                fi
+        fi
-])
-
@@ -137 +193 @@
-        esac
-        
-        AC_DEFUN([_WI_PTHREAD_TEST_INCLUDES], [
-                #include <pthread.h>
-                #include <errno.h>
-
-                void * thread(void *arg) {
-                        return NULL;
-                }
-        ])
-
-
-        AC_DEFUN([_WI_PTHREAD_TEST_FUNCTION], [
-                pthread_t tid;
-
-                if(pthread_create(&tid, 0, thread, NULL) < 0)
-                        return errno;
-
-                return 0;
-        ])
-
-
-        AC_DEFUN([_WI_PTHREAD_TEST_PROGRAM], [
-                _WI_PTHREAD_TEST_INCLUDES
-
-                int main(void) {
-                        _WI_PTHREAD_TEST_FUNCTION
-                }
-        ])
-
-
-        AC_DEFUN([_WI_PTHREAD_TRY], [
-                if test "$_wi_pthreads_found" != yes ; then
-                        OLD_LIBS="$LIBS"
-                        LIBS="$1 $LIBS"
-
-                        AC_RUN_IFELSE([AC_LANG_SOURCE([_WI_PTHREAD_TEST_PROGRAM])], [
-                                _wi_pthreads_test=yes
-                        ], [
-                                _wi_pthreads_test=no
-                        ], [
-                                AC_LINK_IFELSE([AC_LANG_PROGRAM([_WI_PTHREAD_TEST_INCLUDES], [_WI_PTHREAD_TEST_FUNCTION])], [
-                                        _wi_pthreads_test=yes
-                                ], [
-                                        _wi_pthreads_test=no
-                                ])
-                        ])
-
-                        LIBS="$OLD_LIBS"
-
-                        if test "$_wi_pthreads_test" = yes ; then
-                                _wi_pthreads_found=yes
-                                _wi_pthreads_libs="$1"
-                        fi
-                fi
-        ])
-
-
-        AC_CHECK_HEADERS([pthread.h], [
-                AC_MSG_CHECKING([for pthreads])