Overview
Comment: | If we use -pthread(s) in CPPFLAGS, we need it in LIBS as well. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
3d5b91a8c10fc11f22c08e62641b27c7 |
User & Date: | js on 2009-01-03 22:57:49 |
Other Links: | manifest | tags |
Context
2009-01-04
| ||
01:40 | Clean up exceptions. check-in: bb1fe89478 user: js tags: trunk | |
2009-01-03
| ||
22:57 | If we use -pthread(s) in CPPFLAGS, we need it in LIBS as well. check-in: 3d5b91a8c1 user: js tags: trunk | |
2009-01-02
| ||
17:20 | Some import fixes, some static lib and win32 enhancements. check-in: ba01b9c18a user: js tags: trunk | |
Changes
Modified configure.ac from [1b0298c4c8] to [436dc29761].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | AC_INIT(objfw, 0.1, js-objfw@webkeks.org) AC_CONFIG_SRCDIR(src) AC_CANONICAL_HOST AC_CANONICAL_TARGET AC_PROG_CC AC_PROG_OBJC AC_PROG_CPP AC_PROG_LN_S AC_PROG_EGREP CFLAGS="$CFLAGS -Wall" OBJCFLAGS="$OBJCFLAGS -Wall -fobjc-exceptions" LIBS="$LIBS -lobjc" AC_DEFINE(OF_CONFIG_H, 1, [Define so that we know we got our config.h]) BUILDSYS_LIB AC_C_BIGENDIAN([AC_DEFINE(OF_BIG_ENDIAN, 1, [Whether we are big endian])]) | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | AC_INIT(objfw, 0.1, js-objfw@webkeks.org) AC_CONFIG_SRCDIR(src) AC_CANONICAL_HOST AC_CANONICAL_TARGET AC_PROG_CC AC_PROG_OBJC AC_PROG_CPP AC_PROG_LN_S AC_PROG_EGREP CFLAGS="$CFLAGS -Wall" CPPFLAGS="$CPPFLAGS -D_RENTRANT" OBJCFLAGS="$OBJCFLAGS -Wall -fobjc-exceptions" LIBS="$LIBS -lobjc" AC_DEFINE(OF_CONFIG_H, 1, [Define so that we know we got our config.h]) BUILDSYS_LIB AC_C_BIGENDIAN([AC_DEFINE(OF_BIG_ENDIAN, 1, [Whether we are big endian])]) |
︙ | ︙ | |||
62 63 64 65 66 67 68 | ac_cv_snprintf_useful_ret="no", ac_cv_snprintf_useful_ret="no")]) AC_MSG_RESULT($ac_cv_snprintf_useful_ret) test x"$have_asprintf" != x"yes" -a x"$ac_cv_snprintf_useful_ret" != x"yes" && \ AC_MSG_ERROR(No asprintf and no snprintf returning required space!) | | > > > > < < < < < < < < < | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | ac_cv_snprintf_useful_ret="no", ac_cv_snprintf_useful_ret="no")]) AC_MSG_RESULT($ac_cv_snprintf_useful_ret) test x"$have_asprintf" != x"yes" -a x"$ac_cv_snprintf_useful_ret" != x"yes" && \ AC_MSG_ERROR(No asprintf and no snprintf returning required space!) ACX_PTHREAD([ CPPLAGS="$CPPFLAGS $PTHREAD_CFLAGS" LIBS="$LIBS $PTHREAD_LIBS" ], [ AC_MSG_ERROR(You need pthreads!)]) AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32") AC_MSG_CHECKING(whether we have IPv6 support) AC_CACHE_VAL(ac_cv_have_ipv6, [ AC_TRY_RUN([ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> int main() { int fd; struct sockaddr_in6 addr; fd = socket(AF_INET6, SOCK_STREAM, 0); exit(fd >= 0 ? 0 : 1); }], ac_cv_have_ipv6="yes", ac_cv_have_ipv6="no", ac_cv_have_ipv6="no")]) AC_MSG_RESULT($ac_cv_have_ipv6) test x"$ac_cv_have_ipv6" = x"yes" && \ |
︙ | ︙ |
Modified extra.mk.in from [27489ce473] to [0946b120c4].
1 | ASPRINTF = @ASPRINTF@ | < < | 1 2 3 4 | ASPRINTF = @ASPRINTF@ WS2_LIBS = @WS2_LIBS@ TESTS = @TESTS@ TEST_LAUNCHER = @TEST_LAUNCHER@ |
Modified m4/acx_pthread.m4 from [8a9dbf4783] to [79f26df4aa].
︙ | ︙ | |||
162 163 164 165 166 167 168 169 170 171 172 173 174 175 | none) AC_MSG_CHECKING([whether pthreads work without any flags]) ;; -*) AC_MSG_CHECKING([whether pthreads work with $flag]) PTHREAD_CFLAGS="$flag" ;; pthread-config) AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) if test x"$acx_pthread_config" = xno; then continue; fi PTHREAD_CFLAGS="`pthread-config --cflags`" PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" | > | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | none) AC_MSG_CHECKING([whether pthreads work without any flags]) ;; -*) AC_MSG_CHECKING([whether pthreads work with $flag]) PTHREAD_CFLAGS="$flag" PTHREAD_LIBS="$flag" ;; pthread-config) AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) if test x"$acx_pthread_config" = xno; then continue; fi PTHREAD_CFLAGS="`pthread-config --cflags`" PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" |
︙ | ︙ |
Modified src/Makefile from [93c6a4bf93] to [28f4f78243].
︙ | ︙ | |||
20 21 22 23 24 25 26 | INCLUDESTMP = ${SRCS:.c=.h} INCLUDES = ${INCLUDESTMP:.m=.h} \ OFMacros.h \ OFStream.h include ../buildsys.mk | | | | 20 21 22 23 24 25 26 27 28 29 30 31 | INCLUDESTMP = ${SRCS:.c=.h} INCLUDES = ${INCLUDESTMP:.m=.h} \ OFMacros.h \ OFStream.h include ../buildsys.mk CPPFLAGS += -I.. CFLAGS += ${LIB_CFLAGS} OBJCFLAGS += ${LIB_CFLAGS} LD = ${OBJC} LDFLAGS += ${LIB_LDFLAGS} |