← Back to branch summary

~ubuntu-branches/ubuntu/hardy/lasso/hardy

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2007-07-31 21:35:26 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070731213526-oc6jw5mprcd5tjyy
Tags: 2.0.0-1ubuntu1
* Merge from debian unstable. Remaining changes:
  + debian/control:
    - Modify Maintainer value to match DebianMaintainerField spec.
* debian/rules:
  + Add CC=gcc-4.2 to the configure call else configure won't find jni.h
    from libgcj8-dev.
* configure{,.ac}:
  + Add missing quotes around the value for PHP[45]_LIBS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
4
4
if JAVA_ENABLED
5
5
    JAVA_SD = java
6
6
endif
7
 
if PHP_ENABLED
8
 
    PHP_SD = php
 
7
if PHP4_ENABLED
 
8
    PHP4_SD = php
 
9
endif
 
10
if PHP5_ENABLED
 
11
    PHP5_SD = php5
9
12
endif
10
13
if CSHARP_ENABLED
11
14
    CSHARP_SD = csharp
16
19
 
17
20
SUBDIRS         = lasso \
18
21
                  swig \
19
 
                  $(PHP_SD) $(PYTHON_SD) $(JAVA_SD) $(PERL_SD) \
 
22
                  $(PHP4_SD) $(PHP5_SD) $(PYTHON_SD) $(JAVA_SD) $(PERL_SD) \
20
23
                  tests \
21
24
                  win32 \
22
25
                  docs