From: Lars Gullik Bjønnes Date: Wed, 14 Aug 2002 11:24:22 +0000 (+0000) Subject: back to AC_LANG_C[PLUSPLUS] variants X-Git-Tag: 1.6.10~18577 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=82c3424a4a47a1abf0b4c07dc1fb99dc1f035b1d;p=features.git back to AC_LANG_C[PLUSPLUS] variants git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4968 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/config/gtk--.m4 b/config/gtk--.m4 index b6b2f8b58b..65f74acd4a 100644 --- a/config/gtk--.m4 +++ b/config/gtk--.m4 @@ -42,7 +42,7 @@ AC_ARG_ENABLE(gtkmmtest, [ --disable-gtkmmtest Do not try to compile and ru no_gtkmm=yes else AC_LANG_SAVE - AC_LANG(C++) + AC_LANG_CPLUSPLUS GTKMM_CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags` GTKMM_LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs` diff --git a/config/libtool.m4 b/config/libtool.m4 index 59398c5432..8d155e1076 100644 --- a/config/libtool.m4 +++ b/config/libtool.m4 @@ -103,7 +103,7 @@ case $host in CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_SAVE - AC_LANG(C) + AC_LANG_C AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_RESTORE]) if test x"$lt_cv_cc_needs_belf" != x"yes"; then diff --git a/config/qt2.m4 b/config/qt2.m4 index b38b9ce116..a660f58e22 100644 --- a/config/qt2.m4 +++ b/config/qt2.m4 @@ -125,7 +125,7 @@ AC_DEFUN(QT2_AC_PATH_MOC, AC_DEFUN(QT2_PRINT_PROGRAM, [ -AC_LANG(C++) +AC_LANG_CPLUSPLUS cat > conftest.$ac_ext < @@ -301,7 +301,7 @@ dnl check it is Qt2 SAVE_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -I$qt2_includes -L$qt2_libraries" dnl specify we are definitely C++ compiling first -AC_LANG(C++) +AC_LANG_CPLUSPLUS AC_TRY_COMPILE([ #include ], diff --git a/config/xforms.m4 b/config/xforms.m4 index 50cc37ad40..2e7830e9f6 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -70,7 +70,7 @@ save_LIBS=$LIBS LIBS="$XFORMS_LIB $LIBS" lyx_use_xforms_image_loader=no AC_LANG_SAVE -AC_LANG(C) +AC_LANG_C AC_CHECK_LIB(jpeg, jpeg_read_header, [XFORMS_IMAGE_LIB=-ljpeg