← Back to branch summary

~ubuntu-branches/ubuntu/trusty/proj/trusty

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Francesco Paolo Lovergine
  • Date: 2008-08-28 19:31:20 UTC
  • mfrom: (4.1.2 hardy)
  • Revision ID: james.westby@ubuntu.com-20080828193120-regnrhimbqv9wpp5
Tags: 4.6.0-2
http://bugs.debian.org/495995
* proj.3 link moved in the right directory.
* Fixing manpages in debian/rules to avoid too narrow rendering.
  (closes: #495995)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
1
dnl Process this file with autoconf to produce a configure script.
2
2
 
3
3
AC_PREREQ(2.59)
4
 
AC_INIT([PROJ.4 Projections], 4.4.9, [warmerdam@pobox.com], proj)
 
4
AC_INIT([PROJ.4 Projections], 4.6.0, [warmerdam@pobox.com], proj)
5
5
AC_LANG(C)
6
6
 
7
7
 
26
26
dnl Check for JNI support.
27
27
dnl ---------------------------------------------------------------------------
28
28
 
29
 
AC_CHECKING(whether to enable Java/JNI support)
 
29
JNI_INCLUDE=
 
30
export JNI_INCLUDE
30
31
 
31
32
AC_ARG_WITH(jni,
32
 
[  --with-jni              Include Java/JNI support],,)
 
33
[  --with-jni=dir          Include Java/JNI support, add optional include dir],,)
33
34
 
34
35
if test "$with_jni" = "yes" ; then
35
36
 
36
 
  JNI_ENABLED=1
37
 
 
38
 
  AC_DEFINE(JNI_ENABLED,1,[Enabled for Java/JNI Support])
39
 
 
40
 
  AC_MSG_RESULT([enabled])
 
37
  AC_DEFINE(JNI_ENABLED,1,[Enabled for Java/JNI Support])
 
38
 
 
39
  AC_MSG_CHECKING(whether to enable Java/JNI support)
 
40
 
 
41
  AC_MSG_RESULT([enabled])
 
42
 
 
43
elif test "$with_jni" != "no" -a "$with_jni" != "" ; then
 
44
 
 
45
  AC_MSG_CHECKING(whether to enable Java/JNI support)
 
46
 
 
47
  if test \! -r "$with_jni/jni.h" ; then
 
48
    AC_MSG_ERROR(Did not find $with_jni/jni.h)
 
49
  fi
 
50
   
 
51
  AC_DEFINE(JNI_ENABLED,1,[Enabled for Java/JNI Support])
 
52
 
 
53
  AC_MSG_RESULT([enabled])
 
54
 
 
55
  JNI_INCLUDE="-I$with_jni"
 
56
 
 
57
elif test "$with_jni" = "" ; then
 
58
  AC_CHECK_HEADERS(jni.h)
 
59
 
 
60
  AC_MSG_CHECKING(whether to enable Java/JNI support)
 
61
 
 
62
  if test "$ac_cv_header_jni_h" = "no" ; then   
 
63
    AC_MSG_RESULT([disabled])
 
64
  else
 
65
    AC_MSG_RESULT([enabled])
 
66
    AC_DEFINE(JNI_ENABLED,1,[Enabled for Java/JNI Support])
 
67
  fi
41
68
 
42
69
else
 
70
  AC_MSG_CHECKING(whether to enable Java/JNI support)
 
71
 
43
72
  AC_MSG_RESULT([disabled])
44
73
fi
45
74
 
 
75
AC_SUBST(JNI_INCLUDE,$JNI_INCLUDE)
 
76
 
 
77
 
 
78
 
46
79
 
47
80
AC_OUTPUT(Makefile src/Makefile man/Makefile man/man1/Makefile \
48
81
        man/man3/Makefile nad/Makefile \