version 1.121, 2003/10/21 16:22:57
|
version 1.122, 2003/11/18 08:10:23
|
Line 50 dnl
|
Line 50 dnl
|
AC_PROG_YACC |
AC_PROG_YACC |
AC_PROG_CC |
AC_PROG_CC |
AC_PROG_CPP |
AC_PROG_CPP |
|
AC_PROG_CXX |
AC_PROG_LEX |
AC_PROG_LEX |
AC_PROG_AWK |
AC_PROG_AWK |
AC_PROG_INSTALL |
AC_PROG_INSTALL |
Line 613 if test "$ac_cv_c_const" = "no" ; then
|
Line 614 if test "$ac_cv_c_const" = "no" ; then
|
CFLAGS="${CFLAGS} -DCONST= " |
CFLAGS="${CFLAGS} -DCONST= " |
fi |
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 |
dnl Check for availability of amaya sources |
dnl Check for availability of amaya sources |
dnl |
dnl |
Line 1156 dnl
|
Line 1165 dnl
|
dnl The options for each library or binary |
dnl The options for each library or binary |
dnl |
dnl |
|
|
THOT_OPTIONS="$GTK_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="$MATH_OPTIONS $SVG_OPTIONS $GTK_OPTIONS $GENERIC_XML_OPTIONS $I18N_OPTIONS $GL_OPTIONS $MOTIF_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" |
#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" |
IMGLIBS="-ljpeg -lpng -lz" |
EXTRA_LIBS= |
EXTRA_LIBS= |