]>
Commit | Line | Data |
---|---|---|
f93d7add JB |
1 | --- gpsd-2.96/configure.ac.orig 2011-03-22 00:20:02.000000000 +0100 |
2 | +++ gpsd-2.96/configure.ac 2011-03-24 21:03:08.032911291 +0100 | |
3 | @@ -151,13 +151,13 @@ | |
4 | AC_HEADER_TIME | |
5 | AC_STRUCT_TIMEZONE | |
396eb448 JB |
6 | |
7 | -AC_CHECK_LIB(nsl, gethostbyname, LIBNSL="-lnsl") | |
8 | +AC_CHECK_FUNC([gethostbyname], , [AC_CHECK_LIB(nsl, gethostbyname, LIBNSL="-lnsl")]) | |
9 | AC_SUBST(LIBNSL) | |
10 | -AC_CHECK_LIB(socket, socket, LIBSOCKET="-lsocket") | |
11 | +AC_CHECK_FUNC([socket], , [AC_CHECK_LIB(socket, socket, LIBSOCKET="-lsocket")]) | |
12 | AC_SUBST(LIBSOCKET) | |
13 | AC_CHECK_LIB(m, rint, LIBM="-lm") | |
14 | AC_SUBST(LIBM) | |
15 | -AC_CHECK_LIB(c, open, LIBC="-lc") | |
16 | +AC_CHECK_FUNC([open], , [AC_CHECK_LIB(c, open, LIBC="-lc")]) | |
17 | AC_SUBST(LIBC) | |
18 | AC_CHECK_LIB(pthread, pthread_setcancelstate, | |
19 | [LIBPTHREAD="-lpthread" | |
f93d7add JB |
20 | @@ -198,7 +198,7 @@ |
21 | ||
22 | dnl Check for curses headers and libraries. The presence of the | |
23 | dnl library is used to decide whether or not to build some programs. | |
b88610fc AM |
24 | -AC_CHECK_LIB(ncurses, initscr, NCURSES_LIBS="-lncurses") |
25 | +AC_CHECK_LIB(ncurses, initscr, NCURSES_LIBS="-lncurses -ltinfo") | |
26 | AC_SUBST(NCURSES_LIBS) | |
27 | if test x"$NCURSES_LIBS" = x"" ; then | |
28 | AC_MSG_WARN([Not including curses support]) | |
f93d7add JB |
29 | --- gpsd-2.96/Makefile.am.orig 2011-03-15 04:34:31.000000000 +0100 |
30 | +++ gpsd-2.96/Makefile.am 2011-03-24 21:02:52.688910453 +0100 | |
31 | @@ -272,7 +272,7 @@ | |
fe2d2d8e JB |
32 | |
33 | nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i | |
34 | libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) | |
f93d7add JB |
35 | -libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) $(LIBRT) libgps.la |
36 | +libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) $(LIBUSB_LIBS) $(LIBRT) libgps.la | |
fe2d2d8e JB |
37 | |
38 | noinst_SCRIPTS = | |
39 |