Lili Yang / ctools

Commit e45c687bf114a9140e58f1dfcd16d754cd749bd4

Authored by knodlseder
1 parent 7add0557

update

Inline Side-by-side
Showing 1 changed file with 16 additions and 17 deletions
configure.ac
  View file @e45c687
... ... @@ -16,12 +16,18 @@ dnl Set prefix
16 16 dnl ==========
17 17 AC_PREFIX_DEFAULT([/usr/local/gamma])
18 18 if test "x$prefix" = xNONE; then
19   - AC_DEFINE_UNQUOTED([PACKAGE_PREFIX], ["/usr/local/gamma"],
20   - [Location where library is installed])
  19 + ctatools_prefix="/usr/local/gamma"
21 20 else
22   - AC_DEFINE_UNQUOTED([PACKAGE_PREFIX], "${prefix}",
23   - [Location where library is installed])
  21 + ctatools_prefix=${prefix}
24 22 fi
  23 +AC_DEFINE_UNQUOTED([PACKAGE_PREFIX], "${ctatools_prefix}", [Location where library is installed])
  24 +
  25 +
  26 +dnl ==============================================
  27 +dnl Add pkgconfig information of install directory
  28 +dnl ==============================================
  29 +PKG_CONFIG_PATH="${ctatools_prefix}/lib/pkgconfig:/opt/local/lib/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:$PKG_CONFIG_PATH"
  30 +export PKG_CONFIG_PATH
25 31  
26 32  
27 33 dnl ===========================
... ... @@ -150,16 +156,16 @@ if test "x$ac_enable_python_binding" = "xyes"; then
150 156 case $host in
151 157 sparc*-sun-solaris*) PYTHON_BUILD_PREFIX="CC=CC" ;;
152 158 *) PYTHON_BUILD_PREFIX="" ;;
153   - esac
  159 + esac
154 160 AC_SUBST(PYTHON_BUILD_PREFIX)
155   -
  161 +
156 162 # Set host specific extra libraries. Add all host specific libraries here that
157 163 # need to be linked in the python module
158 164 PYTHON_EXTRA_LIBS=
159 165 case $host in
160 166 sparc*-sun-solaris*) PYTHON_EXTRA_LIBS="Cstd" ;;
161 167 *) PYTHON_EXTRA_LIBS="" ;;
162   - esac
  168 + esac
163 169 AC_SUBST(PYTHON_EXTRA_LIBS)
164 170  
165 171 else
... ... @@ -174,13 +180,6 @@ fi
174 180 dnl ===========================
175 181 dnl Checks for GammaLib library
176 182 dnl ===========================
177   -
178   -# Get GammaLib configuration
179   -if test "x$prefix" = xNONE; then
180   - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/gamma/lib/pkgconfig"
181   -else
182   - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$prefix/lib/pkgconfig"
183   -fi
184 183 has_gammalib="no"
185 184 PKG_CHECK_MODULES([GammaLib], [gammalib >= 0.4.7],
186 185 [has_gammalib="yes"],
... ... @@ -189,10 +188,10 @@ PKG_CHECK_MODULES([GammaLib], [gammalib >= 0.4.7],
189 188 AC_MSG_ERROR([If GammaLib is not installed in the default location, please adjust the PKG_CONFIG_PATH environment variable])])
190 189 if test "x$has_gammalib" = "xyes"; then
191 190 AC_DEFINE([HAVE_LIBGAMMA], [1], [Define if gammalib is available])
  191 + CFLAGS="$CFLAGS $GammaLib_CFLAGS"
  192 + CPPFLAGS="$CPPFLAGS $GammaLib_CFLAGS"
  193 + LDFLAGS="$LDFLAGS $GammaLib_LIBS"
192 194 fi
193   -CFLAGS="$CFLAGS $GammaLib_CFLAGS"
194   -CPPFLAGS="$CPPFLAGS $GammaLib_CFLAGS"
195   -LDFLAGS="$LDFLAGS $GammaLib_LIBS"
196 195  
197 196  
198 197 dnl ==================
... ...