Remove g++ dependency
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Tue, 29 Nov 2011 21:34:14 +0000 (22:34 +0100)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Tue, 29 Nov 2011 21:34:14 +0000 (22:34 +0100)
configure.ac
m4/ensc_e2fscheck.m4
src/Makefile-files

index 0eee691..c5a5b31 100644 (file)
@@ -38,13 +38,11 @@ AC_CANONICAL_HOST
 AC_SUBST(GPG_KEY, "0xFFD316AC53ACA43A!")
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PROG_CC_C_O
 PKG_PROG_PKG_CONFIG
-ENSC_CXXCOMPILER
 ENSC_C99COMPILER
 AM_PROG_MKDIR_P
 
@@ -83,7 +81,6 @@ if test x"$prefix" = x/; then
 fi
 
 ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
-ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
 
 AC_MSG_CHECKING([whether to enable extra optimizations])
 AC_ARG_ENABLE([extra-optimizations],
@@ -101,7 +98,6 @@ if test x"$use_extra_optimizations" = x; then
 else
        AC_MSG_RESULT(yes)
        ENSC_CHECK_CC_FLAG([-funit-at-a-time])
-       ENSC_CHECK_CXX_FLAG([-funit-at-a-time])
 fi
 
 AC_MSG_CHECKING([whether to enable debug-code in library])
@@ -519,10 +515,8 @@ AC_CONFIG_COMMANDS_PRE([
                        FEATURES_TXT="\
 Features:
                       CC: $CC, $($CC   --version | sed -e '1p;d')
-                      CXX: $CXX, $($CXX --version | sed -e '1p;d')
                  CPPFLAGS: '$CPPFLAGS'
                    CFLAGS: '$CFLAGS'
-                 CXXFLAGS: '$CXXFLAGS'
                build/host: $build/$host
              Use dietlibc: $ensc_have_dietlibc$ensc_diet_version_msg$ensc_diet_msg$ensc_diet_compat_msg
        Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected
index 12bbb39..5ef288c 100644 (file)
@@ -17,7 +17,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 AC_DEFUN([ENSC_CHECK_EXT2FS_HEADER],
 [
-    AC_LANG_PUSH(C++)
+    AC_LANG_PUSH(C)
     AC_CACHE_CHECK([for ext2fs-headers], [ensc_cv_test_ext2fs_header],[
        AC_COMPILE_IFELSE(AC_LANG_SOURCE([#include <ext2fs/ext2_fs.h>
                                          int main() { return 0; }]),
index ae5c293..a9a18b6 100644 (file)
@@ -17,9 +17,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##  
 
-src_sbin_CXX_PROGS =   
-src_pkglib_CXX_PROGS = 
-
 src_pkglib_C99_PROGS = src/vunify src/vcopy src/vclone
 
 
@@ -127,8 +124,7 @@ pkglib_PROGRAMS +=  src/capchroot \
                        src/h2ext \
                        src/tunctl \
                        src/exec-remount \
-                       $(src_pkglib_C99_X_PROGS) \
-                       $(src_pkglib_CXX_X_PROGS)
+                       $(src_pkglib_C99_X_PROGS)
 
 if ENSC_HAVE_C99_COMPILER
 if ENSC_HAVE_CRYPTO
@@ -169,8 +165,7 @@ sbin_PROGRAMS +=    src/exec-cd \
                        src/vdevmap \
                        src/vtag \
                        src/vspace \
-                       src/vmemctrl \
-                       $(src_sbin_CXX_X_PROGS)
+                       src/vmemctrl
 
 if ENSC_HAVE_C99_COMPILER
 sbin_PROGRAMS +=       src/vdlimit
@@ -368,8 +363,6 @@ src_exec_remount_SOURCES    = src/exec-remount.c
 src_exec_remount_LDADD         = $(VSERVER_LDADDS)
 src_exec_remount_LDFLAGS       = $(VSERVER_LDFLGS)
 
-EXTRA_PROGRAMS +=              $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
-
 TESTS_ENVIRONMENT +=           srctestsuitedir=$(top_builddir)/src/testsuite
 
 if ENSC_HAVE_C99_COMPILER
@@ -380,14 +373,6 @@ src_sbin_C99_X_PROGS =
 src_pkglib_C99_X_PROGS =  
 endif
 
-if ENSC_HAVE_CXX_COMPILER
-src_sbin_CXX_X_PROGS =         $(src_sbin_CXX_PROGS)
-src_pkglib_CXX_X_PROGS =       $(src_pkglib_CXX_PROGS)
-else
-src_sbin_CXX_X_PROGS =
-src_pkglib_CXX_X_PROGS =  
-endif
-
 install-exec-hook:             src_install_exec_hook
 
 src_install_exec_hook: