Bryan Drewery před 12 roky
rodič
revize
6c8f3cef12
3 změnil soubory, kde provedl 5 přidání a 8 odebrání
  1. 2 2
      build/autotools/configure.ac
  2. 3 3
      configure
  3. 0 3
      src/config.h.in

+ 2 - 2
build/autotools/configure.ac

@@ -14,8 +14,8 @@ EGG_SAVE_PARAMETERS
 # Setup build environment
 # Setup build environment
 dnl Search for newer gcc versions before older
 dnl Search for newer gcc versions before older
 #AC_REQUIRE_CPP
 #AC_REQUIRE_CPP
-AC_LANG(C++)
-AC_PROG_CXX([g++49 g++-4.9 g++48 g++-4.8 g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC])
+AC_LANG([C++])
+AC_PROG_CXX([clang++ g++49 g++-4.9 g++48 g++-4.8 g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC])
 dnl AC_PROG_CC([gcc34 gcc-3.4 gcc33 gcc3 gcc-3.3 gcc cc c1])
 dnl AC_PROG_CC([gcc34 gcc-3.4 gcc33 gcc3 gcc-3.3 gcc cc c1])
 EGG_CHECK_CC
 EGG_CHECK_CC
 
 

+ 3 - 3
configure

@@ -2480,7 +2480,7 @@ if test -z "$CXX"; then
     CXX=$CCC
     CXX=$CCC
   else
   else
     if test -n "$ac_tool_prefix"; then
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++49 g++-4.9 g++48 g++-4.8 g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  for ac_prog in clang++ g++49 g++-4.9 g++48 g++-4.8 g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
   do
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2524,7 +2524,7 @@ fi
 fi
 fi
 if test -z "$CXX"; then
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
   ac_ct_CXX=$CXX
-  for ac_prog in g++49 g++-4.9 g++48 g++-4.8 g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  for ac_prog in clang++ g++49 g++-4.9 g++48 g++-4.8 g++47 g++-4.7 g++46 g++-4.6 g++45 g++-4.5 g++-4.4 g++-4.4.1 g++-4.4.2 g++-4.4.0 g++44 g++4 eg++ g++-3.3 g++33 g++-3 g++3 g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
 do
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 set dummy $ac_prog; ac_word=$2
@@ -5273,7 +5273,7 @@ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
   fi
 fi
 fi
 rm -f confcache
 rm -f confcache
-for ac_header in stdarg.h std_arg.h arpa/inet.h fcntl.h limits.h locale.h netdb.h netinet/in.h
+for ac_header in stdarg.h arpa/inet.h fcntl.h limits.h locale.h netdb.h netinet/in.h
 do :
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

+ 0 - 3
src/config.h.in

@@ -151,9 +151,6 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 #undef HAVE_STDLIB_H
 
 
-/* Define to 1 if you have the <std_arg.h> header file. */
-#undef HAVE_STD_ARG_H
-
 /* Define to 1 if you have the `strcasecmp' function. */
 /* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 #undef HAVE_STRCASECMP