~vibhavp/ubuntu/saucy/urg/merge-from-debian

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Vibhav Pant
  • Date: 2013-05-12 03:58:32 UTC
  • mfrom: (3.1.3 sid)
  • Revision ID: vibhavp@ubuntu.com-20130512035832-ybe9ucjmmop9u2m0
* Merge from Debian Unstable. Remaining changes: 
  - Added missing preprocessor directive for FD_SET(3), fixing FTBFS.
  - debian/patches/fix-as-needed-build.patch:
    fix build with ld --as-needed (LP: #803212)
* New upstream release (closes: #701437)

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
 
4
4
AC_PREREQ(2.59)
5
5
 
6
 
AC_INIT(urg, 0.8.12, satofumi@users.sourceforge.jp)
 
6
AC_INIT(urg, 0.8.18, satofumi@users.sourceforge.jp)
7
7
AM_INIT_AUTOMAKE
8
8
AC_CONFIG_SRCDIR([src/c/urg/urg_ctrl.c])
9
9
AM_CONFIG_HEADER([config.h])
40
40
 
41
41
INSTALL_LIBS="-lurg_monitor -lurg -lurg_coordinate -lurg_geometry -lurg_connection -lurg_connection_sdl -lurg_common -lurg_system"
42
42
C_INSTALL_LIBS="-lc_urg -lc_urg_connection -lc_urg_system"
 
43
 
 
44
AC_CHECK_LIB(m, cos, [C_INSTALL_LIBS="$C_INSTALL_LIBS -lm" INSTALL_LIBS="$INSTALL_LIBS -lm" LIBS="$LIBS -lm"], AC_MSG_ERROR([unable to find the cos() function]))
 
45
 
43
46
AC_SUBST(INSTALL_LIBS)
44
47
AC_SUBST(C_INSTALL_LIBS)
45
48
 
64
67
AC_FUNC_SELECT_ARGTYPES
65
68
AC_FUNC_STRERROR_R
66
69
AC_FUNC_VPRINTF
 
70
AC_FUNC_STAT
67
71
AC_CHECK_FUNCS([atexit floor gettimeofday memmove select strerror strrchr strtol strstr])
68
72
AC_SUBST(SAMPLES_LIBS_PATH, "-L\${top_builddir}/src/c/urg -L\${top_builddir}/src/c/connection -L\${top_builddir}/src/c/system -L\${top_builddir}/src/cpp/urg -L\${top_builddir}/src/cpp/connection -L\${top_builddir}/src/cpp/common -L\${top_builddir}/src/cpp/system -L\${top_builddir}/src/cpp/monitor -L\${top_builddir}/src/cpp/coordinate -L\${top_builddir}/src/cpp/geometry -L\${top_builddir}/src/cpp/connection/sdl")
69
73
AC_CONFIG_FILES([Makefile