--- Amaya/configure.in	2003/10/21 16:22:57	1.121
+++ Amaya/configure.in	2003/11/18 08:10:23	1.122
@@ -50,6 +50,7 @@ dnl
 AC_PROG_YACC
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 AC_PROG_LEX
 AC_PROG_AWK
 AC_PROG_INSTALL
@@ -613,6 +614,14 @@ if test "$ac_cv_c_const" = "no" ; then
   CFLAGS="${CFLAGS} -DCONST= "
 fi
 
+
+# force C mode (-x c)
+CFLAGS="${CFLAGS} -x c "
+
+# C++ options (-x c++)
+CXXFLAGS="${CXXFLAGS} -W -x c++ "
+CXX_OPTIONS="-D__cplusplus"
+
 dnl
 dnl Check for availability of amaya sources
 dnl
@@ -1156,10 +1165,10 @@ dnl
 dnl The options for each library or binary
 dnl
 
-THOT_OPTIONS="$GTK_OPTIONS $I18N_OPTIONS $GL_OPTIONS $MOTIF_OPTIONS $NOGUI_OPTIONS"
-AMAYA_OPTIONS="$MATH_OPTIONS $SVG_OPTIONS $GTK_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $GL_OPTIONS $MOTIF_OPTIONS $NOGUI_OPTIONS"
+THOT_OPTIONS="$CXX_OPTIONS $I18N_OPTIONS $MOTIF_OPTIONS $GTK_OPTIONS $GL_OPTIONS $NOGUI_OPTIONS"
+AMAYA_OPTIONS="$CXX_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $MOTIF_OPTIONS $GTK_OPTIONS $GL_OPTIONS $NOGUI_OPTIONS"
 #PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"
-AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS $I18N_OPTIONS"
+AMAYA_ANNOT_OPTIONS="$CXX_OPTIONS $AMAYA_ANNOT_OPTIONS $I18N_OPTIONS"
 
 IMGLIBS="-ljpeg -lpng -lz"
 EXTRA_LIBS=