Commit 222c297523d36269dda2a487bdff3612418d4fa6
1 parent
485abe08
Search GammaLib in prefixed directory before searching in GAMMALIB directory. Th…
…is to allow for local installation on top of an existing installation.
Showing
1 changed file
with
3 additions
and
3 deletions
configure.ac
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | # Configuration for ctools - a set of tools for science analysis of CTA # | 2 | # Configuration for ctools - a set of tools for science analysis of CTA # |
| 3 | # data # | 3 | # data # |
| 4 | # ------------------------------------------------------------------------- # | 4 | # ------------------------------------------------------------------------- # |
| 5 | -# Copyright (C) 2011 Jurgen Knodlseder # | 5 | +# Copyright (C) 2011-2012 Juergen Knoedlseder # |
| 6 | # ------------------------------------------------------------------------- # | 6 | # ------------------------------------------------------------------------- # |
| 7 | # # | 7 | # # |
| 8 | # This program is free software: you can redistribute it and/or modify # | 8 | # This program is free software: you can redistribute it and/or modify # |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | ############################################################################# | 29 | ############################################################################# |
| 30 | # Initialisation # | 30 | # Initialisation # |
| 31 | ############################################################################# | 31 | ############################################################################# |
| 32 | -AC_INIT([ctools], [0.4.0], [knodlseder@cesr.fr], [ctools]) | 32 | +AC_INIT([ctools], [0.4.0], [jurgen.knodlseder@irap.omp.eu], [ctools]) |
| 33 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) | 33 | AC_CONFIG_SRCDIR([src/ctselect/ctselect.cpp]) |
| 34 | AC_CONFIG_MACRO_DIR([m4]) | 34 | AC_CONFIG_MACRO_DIR([m4]) |
| 35 | AM_INIT_AUTOMAKE([gnu no-dependencies]) | 35 | AM_INIT_AUTOMAKE([gnu no-dependencies]) |
| @@ -647,7 +647,7 @@ LDFLAGS=$SAVED_LDFLAGS | @@ -647,7 +647,7 @@ LDFLAGS=$SAVED_LDFLAGS | ||
| 647 | # If GammaLib has not been found in any standard path then search now in a | 647 | # If GammaLib has not been found in any standard path then search now in a |
| 648 | # number of predefined locations. | 648 | # number of predefined locations. |
| 649 | if test "x$has_gammalib" = "xno"; then | 649 | if test "x$has_gammalib" = "xno"; then |
| 650 | - for i in "$GAMMALIB" "$ctools_prefix" /opt/local /usr/local /usr ; do | 650 | + for i in "$ctools_prefix" "$GAMMALIB" /opt/local /usr/local /usr ; do |
| 651 | if test -f $i/lib64/libgamma.so -o -f $i/lib64/libgamma.dylib; then | 651 | if test -f $i/lib64/libgamma.so -o -f $i/lib64/libgamma.dylib; then |
| 652 | if test -d $i/include/gammalib; then | 652 | if test -d $i/include/gammalib; then |
| 653 | LIBDIR_GAMMALIB=$i/lib64 | 653 | LIBDIR_GAMMALIB=$i/lib64 |