Changeset 5684:b1596a025f3f in roaraudio

Timestamp:

09/28/12 11:39:17 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved checks for winsock and pthreads out into build system

Files:

• build-system/configure.tests (modified) (1 diff)
• configure (modified) (5 diffs)

build-system/configure.tests

@@ -867 +867 @@
 }
 
+test_winsock() {
+ test_lib_defmake ${ROAR_BUILDSYSTEM_DEFPREFIX}HAVE_LIBWSOCK32    %            WinSockP0     wsock32    -- winsock2.h
+ test_lib_defmake ${ROAR_BUILDSYSTEM_DEFPREFIX}HAVE_LIBWS2_32     %            WinSockP1     ws2_32     -- winsock2.h
+ echo 'NETLIBS += $(lib_wsock32) $(lib_ws2_32)' >&4
+}
+
+test_netlibs() {
+ test_winsock
+}
+
+test_pthread() {
+ echo -n 'checking for -pthread... '
+
+ echo '#include <pthread.h>'                            > $TF_C
+ echo 'int main (void) { pthread_self(); return 0; }'  >> $TF_C
+
+ if $CCTF -pthread 2> /dev/null;
+ then
+  echo '#define ROAR_HAVE_CC_PTHREAD_OPTION' >&3
+  echo 'opt_pthread=-pthread' >&4
+  echo 'pthread=$(opt_pthread)' >&4
+  echo yes
+ else
+  echo 'opt_pthread=' >&4
+  echo 'pthread=$(lib_pthread)' >&4
+  echo no
+  test_lib_defmake ${ROAR_BUILDSYSTEM_DEFPREFIX}HAVE_LIBPTHREAD    %            libpthread    pthread    -- pthread.h
+ fi
+}
+
 #ll

configure

@@ -3 +3 @@
 CWD="`pwd`"
 ROAR_BUILDSYSTEM_DIR="$CWD/build-system"
+ROAR_BUILDSYSTEM_DEFPREFIX="ROAR_"
 
 . "$ROAR_BUILDSYSTEM_DIR/configure.all"
@@ -699 +700 @@
 test_lib_defmake ROAR_HAVE_LIBUUID       %            libuuid       uuid       -- uuid/uuid.h
 test_lib_defmake ROAR_HAVE_LIBDNET       %            libdnet       dnet       -- sys/socket.h netdnet/dn.h netdnet/dnetdb.h
-test_lib_defmake ROAR_HAVE_LIBPTHREAD    %            libpthread    pthread    -- pthread.h
 OLD_MINIMAL=$MINIMAL
 MINIMAL=false
@@ -715 +715 @@
 test_lib_defmake ROAR_HAVE_LIBSENDFILE   %            sendfile      sendfile   -- sys/sendfile.h
 test_lib_defmake ROAR_HAVE_LIBSOCKET     %            libsocket     socket     -- sys/socket.h
-test_lib_defmake ROAR_HAVE_LIBWSOCK32    %            WinSockP0     wsock32    -- winsock2.h
-test_lib_defmake ROAR_HAVE_LIBWS2_32     %            WinSockP1     ws2_32     -- winsock2.h
 test_lib_defmake ROAR_HAVE_LIBX11        %            X11           X11        -- X11/Xlib.h X11/Xatom.h
 test_lib_defmake ROAR_HAVE_GTK_P_2_0     %            GTK+2.0       gtk+-2.0/t -- gtk/gtk.h gdk/gdkkeysyms.h
@@ -722 +720 @@
 test_lib_defmake ROAR_HAVE_LIBJACK       %            libjack       jack/t     -- jack/jack.h
 test_lib_defmake ROAR_HAVE_LIBDBUS       %            libdbus       dbus-1/t   -- dbus-1.0/dbus/dbus.h
+test_netlibs
 
 echo >&3
@@ -1085 +1084 @@
 
 
-echo -n 'checking for -pthread... '
-
-echo '#include <pthread.h>'                            > $TF_C
-echo 'int main (void) { pthread_self(); return 0; }'  >> $TF_C
-
-if $CCTF -pthread 2> /dev/null;
-then
- echo '#define ROAR_HAVE_CC_PTHREAD_OPTION' >&3
- echo 'opt_pthread=-pthread' >&4
- echo 'pthread=$(opt_pthread)' >&4
- echo yes
-else
- echo 'opt_pthread=' >&4
- echo 'pthread=$(lib_pthread)' >&4
- echo no
-fi
+test_pthread