← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nordugrid-arc/trusty

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Mattias Ellert
  • Date: 2012-12-13 16:41:31 UTC
  • mfrom: (3.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20121213164131-wii0p2fcv7e3en93
Tags: 2.0.1-1
* 2.0.1 Release
* Drop patches accepted upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
389
389
    AC_CHECK_PROGS(JAR, fastjar jar)
390
390
  fi
391
391
 
 
392
  # Set absolute limit on Java heap size allocation instead of letting
 
393
  # java (on Linux) allocate a quarter of the total memory.
 
394
  JAVA_VM_FLAGS="-J-Xms50M -J-Xmx50M"
 
395
 
 
396
  JAR_JFLAGS=""
 
397
  # Old versions of fastjar does not ignore -J options
 
398
  if test "x$JAR" != "x" && test "x`basename $JAR`" = "xjar"; then
 
399
      JAR_JFLAGS="$JAVA_VM_FLAGS"
 
400
  fi
 
401
 
392
402
  if test "x$JAVAC" != "x" && test "x`basename $JAVAC`" = "xgcj"; then
393
403
    JAVAC_FLAGS="-C --classpath=."
394
404
  elif test "x$JAVAC" != "x" && test "x`basename $JAVAC`" = "xjavac"; then
395
 
    JAVAC_FLAGS="-cp ."
 
405
    JAVAC_FLAGS="$JAVA_VM_FLAGS -cp ."
396
406
  fi
397
407
 
398
408
  JAVAWRAP=no
422
432
AC_MSG_NOTICE([Java enabled: $enables_java])
423
433
AM_CONDITIONAL([JAVA_ENABLED],[test "x$enables_java" = "xyes"])
424
434
 
 
435
AC_SUBST(JAR_JFLAGS)
425
436
AC_SUBST(JAVAC_FLAGS)
426
437
AC_SUBST(JDK_CFLAGS)
427
438
 
895
906
          XMLSEC_LIBS="`$XMLSEC_CONFIG --libs`"
896
907
          XMLSEC_CFLAGS="`$XMLSEC_CONFIG --cflags`"
897
908
          #check the xmlsec1-openssl here
898
 
          PKG_CONFIG_PATH="$with_xmlsec1/lib/pkgconfig/:$PKG_CONFIG_PATH"
 
909
          if test "x$PKG_CONFIG_PATH" != "x"; then
 
910
            PKG_CONFIG_PATH="$with_xmlsec1/lib/pkgconfig:$PKG_CONFIG_PATH"
 
911
          else
 
912
            PKG_CONFIG_PATH="$with_xmlsec1/lib/pkgconfig"
 
913
          fi
899
914
          PKG_CHECK_MODULES(XMLSEC_OPENSSL, [xmlsec1-openssl >= $XMLSEC_OPENSSL_MIN_VERSION],
900
915
              [XMLSEC_INSTALLED=yes],[XMLSEC_INSTALLED=no])
901
916
        else
904
919
      fi
905
920
  elif test "x$XMLSEC_INSTALLED" = "xno" -a "x$MACOSX" = "xyes"; then
906
921
    #MACOSX has no "ldd" which is needed by xmlsec1-config, so here simply we use PKG_CHECK_MODULES
907
 
    PKG_CONFIG_PATH="$with_xmlsec1/lib/pkgconfig/:$PKG_CONFIG_PATH"
 
922
    if test "x$PKG_CONFIG_PATH" != "x"; then
 
923
      PKG_CONFIG_PATH="$with_xmlsec1/lib/pkgconfig:$PKG_CONFIG_PATH"
 
924
    else
 
925
      PKG_CONFIG_PATH="$with_xmlsec1/lib/pkgconfig"
 
926
    fi
908
927
    PKG_CHECK_MODULES(XMLSEC, [xmlsec1 >= $XMLSEC_MIN_VERSION],
909
928
        [XMLSEC_INSTALLED=yes], [XMLSEC_INSTALLED=no])
910
929
    if test "x$XMLSEC_INSTALLED" = "xyes" ; then
1062
1081
  AC_ARG_WITH(argus,
1063
1082
    AC_HELP_STRING([--with-argus=PATH], [ARGUS PEP installation path]),
1064
1083
    [
1065
 
      PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
 
1084
      if test "x$PKG_CONFIG_PATH" != "x"; then
 
1085
        PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH"
 
1086
      else
 
1087
        PKG_CONFIG_PATH="$withval/lib/pkgconfig"
 
1088
      fi
1066
1089
    ]
1067
1090
  )
1068
1091
  PKG_CHECK_MODULES(ARGUS, [libargus-pep >= 2.0.0], [], [
1494
1517
AC_SUBST(LFC_LIBS)
1495
1518
 
1496
1519
 
1497
 
# Check for GFAL
 
1520
# Check for GFAL2
1498
1521
 
1499
 
AC_ARG_ENABLE(gfal, AC_HELP_STRING([--enable-gfal], [disable the GFAL support, default is disable]),[enables_gfal="$enableval"],[])
 
1522
AC_ARG_ENABLE(gfal, AC_HELP_STRING([--enable-gfal], [enable the GFAL support, default is disable]),[enables_gfal="$enableval"],[])
1500
1523
if test "x$enables_gfal" = "xyes"; then
1501
 
  GFAL_CFLAGS="-I/usr/include/gfal2"
1502
 
  AC_ARG_WITH(gfal, [  --with-gfal=(PATH)  GFAL location])
1503
 
  if test ! "x$with_gfal" = "x" ; then
1504
 
    GFAL_LOCATION="$with_gfal"
1505
 
    GFAL_CFLAGS="-I$GFAL_LOCATION/include/gfal2"
1506
 
    if test -d $GFAL_LOCATION/lib64; then
1507
 
      GFAL_LDFLAGS="-L$GFAL_LOCATION/lib64"
1508
 
    else
1509
 
      GFAL_LDFLAGS="-L$GFAL_LOCATION/lib"
1510
 
    fi
1511
 
  fi
1512
 
  SAVE_CPPFLAGS=$CPPFLAGS
1513
 
  CPPFLAGS="$CPPFLAGS $GFAL_CFLAGS"
1514
 
  AC_CHECK_HEADER(gfal_api.h, [], [enables_gfal="no"])
1515
 
  CPPFLAGS=$SAVE_CPPFLAGS
1516
 
  SAVE_LDFLAGS=$LDFLAGS
1517
 
  LDFLAGS="$LDFLAGS $GFAL_LDFLAGS"
1518
 
  AC_CHECK_LIB([gfal2], [_init],
1519
 
               [GFAL_LIBS="$GFAL_LDFLAGS -lgfal2"], [enables_gfal="no"])
1520
 
  LDFLAGS=$SAVE_LDFLAGS
 
1524
  PKG_CHECK_MODULES(GFAL2, gfal_transfer, [], [enables_gfal="no"])
 
1525
  AC_SUBST(GFAL2_CFLAGS)
 
1526
  AC_SUBST(GFAL2_LIBS)
1521
1527
fi
1522
 
AC_SUBST(GFAL_CFLAGS)
1523
 
AC_SUBST(GFAL_LIBS)
1524
1528
 
1525
1529
# Check for xrootd (c++)
1526
1530