Justine Devin / gammalib

Commit 0c6389673bf7147c8beb5c6a90d2995fcb1e9bdc

Authored by Jürgen Knödlseder
1 parent fca863b7

Correct Mac OS X clang kluge. 

The former Mac OS X clang kluge did not set the OBJEXT variable correctly (it was left blank). This has now been corrected.
Inline Side-by-side
Showing 1 changed file with 11 additions and 14 deletions
configure.ac
  View file @0c63896
... ... @@ -82,26 +82,23 @@ AC_CANONICAL_HOST
82 82 # A special kluge was added for Mac OS X >=10.7. As Apple switched to clang #
83 83 # we search from this version on for the clang compiler. #
84 84 #############################################################################
  85 +
  86 +# Set default compiler lists
  87 +cxx_list="g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++"
  88 +cc_list="gcc cc cl.exe clang"
  89 +
85 90 # Check if we have Mac OS X >= 10.7
86   -ac_sys_system=`uname -s`
87   -if test "$ac_sys_system" = "Darwin"; then
88   - cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
89   - if test ${cur_target} '>' 10.6; then
90   - mac_clang="yes"
  91 +if test `uname -s` = "Darwin"; then
  92 + if test `sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'` '>' 10.6; then
  93 + cxx_list="clang++ g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC"
  94 + cc_list="clang gcc cc cl.exe"
91 95 fi
92 96 fi
93 97  
94 98 # Our language is C++
95 99 AC_LANG(C++)
96   -
97   -# Check for compilers
98   -if test "x$mac_clang" = "xyes"; then
99   - AC_PROG_CXX([clang++ g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC])
100   - AC_PROG_CC([clang gcc cc cl.exe])
101   -else
102   - AC_PROG_CXX([g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++])
103   - AC_PROG_CC([gcc cc cl.exe clang])
104   -fi
  100 +AC_PROG_CXX($cxx_list)
  101 +AC_PROG_CC($cc_list)
105 102  
106 103  
107 104 #############################################################################
... ...