← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to m4/pandora_drizzle_build.m4

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_drizzle_build.m4
9
9
 
10
10
AC_DEFUN([PANDORA_DRIZZLE_BUILD],[
11
11
 
12
 
  dnl We need to turn on our CXXFLAGS to make sure it shows up correctly
13
 
  PANDORA_CXX_STL_HASH
14
 
 
15
 
  PANDORA_CXX_CSTDINT
16
 
  PANDORA_CXX_CINTTYPES
17
 
 
18
12
  AC_STRUCT_TM
19
13
 
20
14
  AC_FUNC_ALLOCA
39
33
  AC_CHECK_HEADERS(sys/types.h sys/fpu.h fpu_control.h ieeefp.h)
40
34
  AC_CHECK_HEADERS(select.h sys/select.h)
41
35
  AC_CHECK_HEADERS(utime.h sys/utime.h )
42
 
  AC_CHECK_HEADERS(synch.h sys/mman.h sys/socket.h)
 
36
  AC_CHECK_HEADERS(synch.h sys/mman.h)
43
37
  AC_CHECK_HEADERS(sched.h)
44
38
  AC_CHECK_HEADERS(sys/prctl.h)
45
39
  AC_CHECK_HEADERS(execinfo.h)
70
64
  AC_CHECK_TYPES([uint, ulong])
71
65
 
72
66
  PANDORA_CXX_DEMANGLE
73
 
 
74
 
  AH_TOP([
75
 
#ifndef __CONFIG_H__
76
 
#define __CONFIG_H__
77
 
 
78
 
#include "config/top.h"
79
 
])
80
 
  mkdir -p config
81
 
  cat > config/top.h.stamp <<EOF_CONFIG_TOP
82
 
 
83
 
#if defined(i386) && !defined(__i386__)
84
 
#define __i386__
85
 
#endif
86
 
 
87
 
#if defined(_FILE_OFFSET_BITS)
88
 
# undef _FILE_OFFSET_BITS
89
 
#endif
90
 
EOF_CONFIG_TOP
91
 
  diff config/top.h.stamp config/top.h >/dev/null 2>&1 || mv config/top.h.stamp config/top.h
92
 
  rm -f config/top.h.stamp
93
 
 
94
 
 
95
 
  AH_BOTTOM([
96
 
#if defined(__cplusplus)
97
 
# include CSTDINT_H
98
 
# include CINTTYPES_H
99
 
#else
100
 
# include <stdint.h>
101
 
# include <inttypes.h>
102
 
#endif
103
 
 
104
 
#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
105
 
typedef unsigned long int ulong;
106
 
#endif
107
 
 
108
 
#endif /* __CONFIG_H__ */
109
 
  ])
 
67
  PANDORA_REQUIRE_BOOST([1.38])
 
68
  PANDORA_REQUIRE_BOOST_PROGRAM_OPTIONS
 
69
  PANDORA_REQUIRE_BOOST_THREAD
 
70
  PANDORA_REQUIRE_BOOST_REGEX
 
71
  PANDORA_REQUIRE_BOOST_DATE_TIME
 
72
  PANDORA_REQUIRE_BOOST_FILESYSTEM
 
73
 
110
74
])