Menu
▾
▴
[Easycalc-commits] easycalc Makefile.in, 1.29, 1.30 configure, 1.15, 1.16 configure.in, 1.15, 1.16
|
From: Ton v. O. <tvo...@us...> - 2006-08-07 15:39:18
|
Update of /cvsroot/easycalc/easycalc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7142 Modified Files: Makefile.in configure configure.in Log Message: All Makefile build options can now be set in the configure script: --enable-specfun, --enable-graphfun, --enable-diasupport, --with-sonysdk, --with-handerasdk. Index: Makefile.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/Makefile.in,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Makefile.in 1 Aug 2006 23:53:32 -0000 1.29 --- Makefile.in 7 Aug 2006 15:39:11 -0000 1.30 *************** *** 3,8 **** ## ! SONYSDK = yes ! HANDERASDK = yes CC = @CC@ PILXFER = @PILXFER@ --- 3,19 ---- ## ! # ----------- Configuration options and optional SDK paths -------------- ! ! SPECFUN_ENABLED = @SPECFUN@ ! GRAPHS_ENABLED = @GRAPHFUN@ ! DIA_ENABLED = @DIASUPP@ ! SONYSDK = @SONYSDK@ ! HANDERASDK = @HANDERASDK@ ! ! SONYINC = -I/PalmDev/clie-sdk-5/include -I/PalmDev/clie-sdk-5/include/Libraries -I/PalmDev/clie-sdk-5/include/System ! HANDERAINC = -I/PalmDev/handera/include ! ! # ----------- End of configuration options ------------------------------ ! CC = @CC@ PILXFER = @PILXFER@ *************** *** 12,19 **** CTAGS = @CTAGS@ - GRAPHS_ENABLED = @SPECFUN@ - SPECFUN_ENABLED = @SPECFUN@ - DIA_ENABLED = @DIASUPP@ - LANGDIR = langs LANG = @LANGS@ --- 23,26 ---- *************** *** 45,49 **** OBJS = $(CALC_OBJS) ! ifdef GRAPHS_ENABLED OBJS += $(GRAPH_OBJS) CFLAGS += -DGRAPHS_ENABLED --- 52,56 ---- OBJS = $(CALC_OBJS) ! ifeq "$(GRAPHS_ENABLED)" "yes" OBJS += $(GRAPH_OBJS) CFLAGS += -DGRAPHS_ENABLED *************** *** 52,72 **** endif ! ifdef SPECFUN_ENABLED OBJS += $(SPECFUN_OBJS) CFLAGS += -DSPECFUN_ENABLED PILRCFLAGS += -D SPECFUN_ENABLED ! ifdef DIA_ENABLED OBJS += $(DIA_OBJS) CFLAGS += -I./calc-dia -DSUPPORT_DIA PILRCFLAGS += -I ./calc-dia -D SUPPORT_DIA endif - endif ifeq "$(SONYSDK)" "yes" ! CFLAGS += -DSONY_SDK -I/PalmDev/clie-sdk-5/include -I/PalmDev/clie-sdk-5/include/Libraries -I/PalmDev/clie-sdk-5/include/System endif ifeq "$(HANDERASDK)" "yes" ! CFLAGS += -DHANDERA_SDK -I/PalmDev/handera/include endif --- 59,80 ---- endif ! ifeq "$(SPECFUN_ENABLED)" "yes" OBJS += $(SPECFUN_OBJS) CFLAGS += -DSPECFUN_ENABLED PILRCFLAGS += -D SPECFUN_ENABLED ! endif ! ! ifeq "$(DIA_ENABLED)" "yes" OBJS += $(DIA_OBJS) CFLAGS += -I./calc-dia -DSUPPORT_DIA PILRCFLAGS += -I ./calc-dia -D SUPPORT_DIA endif ifeq "$(SONYSDK)" "yes" ! CFLAGS += -DSONY_SDK $(SONYINC) endif ifeq "$(HANDERASDK)" "yes" ! CFLAGS += -DHANDERA_SDK $(HANDERAINC) endif Index: configure =================================================================== RCS file: /cvsroot/easycalc/easycalc/configure,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** configure 1 Aug 2006 19:29:18 -0000 1.15 --- configure 7 Aug 2006 15:39:11 -0000 1.16 *************** *** 1,5 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59. # # Copyright (C) 2003 Free Software Foundation, Inc. --- 1,5 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.59 for EasyCalc 1.24. # # Copyright (C) 2003 Free Software Foundation, Inc. *************** *** 266,277 **** # Identity of this package. ! PACKAGE_NAME= ! PACKAGE_TARNAME= ! PACKAGE_VERSION= ! PACKAGE_STRING= ! PACKAGE_BUGREPORT= ! ac_unique_file="calc.c" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LANGS SPECFUN DIASUPP CC PILRC MULTIGEN BUILDPRC PILXFER CTAGS LIBOBJS LTLIBOBJS' ac_subst_files='' --- 266,276 ---- # Identity of this package. ! PACKAGE_NAME='EasyCalc' ! PACKAGE_TARNAME='easycalc' ! PACKAGE_VERSION='1.24' ! PACKAGE_STRING='EasyCalc 1.24' ! PACKAGE_BUGREPORT='' ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LANGS SPECFUN GRAPHFUN DIASUPP SONYSDK HANDERASDK CC PILRC MULTIGEN BUILDPRC PILXFER CTAGS LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 722,726 **** # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures this package to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... --- 721,725 ---- # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures EasyCalc 1.24 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... *************** *** 778,782 **** if test -n "$ac_init_help"; then ! cat <<\_ACEOF --- 777,783 ---- if test -n "$ac_init_help"; then ! case $ac_init_help in ! short | recursive ) echo "Configuration of EasyCalc 1.24:";; ! esac cat <<\_ACEOF *************** *** 784,789 **** --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ! --enable-specfun Compile in special functions and graphs ! --enable-diasupport Compile in DIA support (only if specfun enabled) _ACEOF --- 785,798 ---- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ! --enable-specfun include special functions (default = yes) ! --enable-graphfun include graphs (default = yes) ! --enable-diasupport include DIA support (default = yes) ! ! Optional Packages: ! --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ! --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ! --with-sonysdk use Sony SDK for PalmOS4 hires support (default = ! no) ! --with-handerasdk use Handera SDK for QVGA support (default = no) _ACEOF *************** *** 882,885 **** --- 891,896 ---- if $ac_init_version; then cat <<\_ACEOF + EasyCalc configure 1.24 + generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. *************** *** 894,898 **** running configure, to aid debugging if configure makes a mistake. ! It was created by $as_me, which was generated by GNU Autoconf 2.59. Invocation command line was --- 905,909 ---- running configure, to aid debugging if configure makes a mistake. ! It was created by EasyCalc $as_me 1.24, which was generated by GNU Autoconf 2.59. Invocation command line was *************** *** 1223,1244 **** LANGS="en de sp cs pt fr it ru_win ru_koi8 ja" # Check whether --enable-specfun or --disable-specfun was given. if test "${enable_specfun+set}" = set; then enableval="$enable_specfun" ! SPECFUN=true else ! SPECFUN= fi; # Check whether --enable-diasupport or --disable-diasupport was given. if test "${enable_diasupport+set}" = set; then enableval="$enable_diasupport" ! DIASUPP=true else ! DIASUPP= fi; --- 1234,1313 ---- + + + + + + + + LANGS="en de sp cs pt fr it ru_win ru_koi8 ja" + echo "$as_me:$LINENO: checking if special functions are enabled" >&5 + echo $ECHO_N "checking if special functions are enabled... $ECHO_C" >&6 # Check whether --enable-specfun or --disable-specfun was given. if test "${enable_specfun+set}" = set; then enableval="$enable_specfun" ! SPECFUN=$enable_specfun else ! SPECFUN=yes;enable_specfun=yes ! fi; ! echo "$as_me:$LINENO: result: $enable_specfun" >&5 ! echo "${ECHO_T}$enable_specfun" >&6 ! ! ! echo "$as_me:$LINENO: checking if graphics form and functions are enabled" >&5 ! echo $ECHO_N "checking if graphics form and functions are enabled... $ECHO_C" >&6 ! # Check whether --enable-graphfun or --disable-graphfun was given. ! if test "${enable_graphfun+set}" = set; then ! enableval="$enable_graphfun" ! GRAPHFUN=$enable_graphfun ! else ! GRAPHFUN=yes;enable_graphfun=yes fi; + echo "$as_me:$LINENO: result: $enable_graphfun" >&5 + echo "${ECHO_T}$enable_graphfun" >&6 + + echo "$as_me:$LINENO: checking if Dynamic Input Area support is enabled" >&5 + echo $ECHO_N "checking if Dynamic Input Area support is enabled... $ECHO_C" >&6 # Check whether --enable-diasupport or --disable-diasupport was given. if test "${enable_diasupport+set}" = set; then enableval="$enable_diasupport" ! DIASUPP=$enable_diasupport else ! DIASUPP=yes;enable_diasupport=yes fi; + echo "$as_me:$LINENO: result: $enable_diasupport" >&5 + echo "${ECHO_T}$enable_diasupport" >&6 + + + echo "$as_me:$LINENO: checking if Sony SDK is used" >&5 + echo $ECHO_N "checking if Sony SDK is used... $ECHO_C" >&6 + + # Check whether --with-sonysdk or --without-sonysdk was given. + if test "${with_sonysdk+set}" = set; then + withval="$with_sonysdk" + SONYSDK=$with_sonysdk + else + SONYSDK=no;with_sonysdk=no + fi; + echo "$as_me:$LINENO: result: $with_sonysdk" >&5 + echo "${ECHO_T}$with_sonysdk" >&6 + + + echo "$as_me:$LINENO: checking if Handera SDK is used" >&5 + echo $ECHO_N "checking if Handera SDK is used... $ECHO_C" >&6 + + # Check whether --with-handerasdk or --without-handerasdk was given. + if test "${with_handerasdk+set}" = set; then + withval="$with_handerasdk" + HANDERASDK=$with_handerasdk + else + HANDERASDK=no;with_handerasdk=no + fi; + echo "$as_me:$LINENO: result: $with_handerasdk" >&5 + echo "${ECHO_T}$with_handerasdk" >&6 *************** *** 1923,1927 **** cat >&5 <<_CSEOF ! This file was extended by $as_me, which was generated by GNU Autoconf 2.59. Invocation command line was --- 1992,1996 ---- cat >&5 <<_CSEOF ! This file was extended by EasyCalc $as_me 1.24, which was generated by GNU Autoconf 2.59. Invocation command line was *************** *** 1978,1982 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! config.status configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" --- 2047,2051 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! EasyCalc config.status 1.24 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" *************** *** 2166,2170 **** --- 2235,2242 ---- s,@LANGS@,$LANGS,;t t s,@SPECFUN@,$SPECFUN,;t t + s,@GRAPHFUN@,$GRAPHFUN,;t t s,@DIASUPP@,$DIASUPP,;t t + s,@SONYSDK@,$SONYSDK,;t t + s,@HANDERASDK@,$HANDERASDK,;t t s,@CC@,$CC,;t t s,@PILRC@,$PILRC,;t t Index: configure.in =================================================================== RCS file: /cvsroot/easycalc/easycalc/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** configure.in 1 Aug 2006 19:29:18 -0000 1.15 --- configure.in 7 Aug 2006 15:39:11 -0000 1.16 *************** *** 1,4 **** dnl Process this file with autoconf to produce a configure script. ! AC_INIT(calc.c) LANGS="en de sp cs pt fr it ru_win ru_koi8 ja" --- 1,4 ---- dnl Process this file with autoconf to produce a configure script. ! AC_INIT(EasyCalc, 1.24) LANGS="en de sp cs pt fr it ru_win ru_koi8 ja" *************** *** 6,18 **** dnl Special functions enabled AC_ARG_ENABLE(specfun, ! [ --enable-specfun Compile in special functions and graphs], ! [SPECFUN=true],[SPECFUN=]) AC_SUBST(SPECFUN) AC_ARG_ENABLE(diasupport, ! [ --enable-diasupport Compile in DIA support (only if specfun enabled)], ! [DIASUPP=true],[DIASUPP=]) AC_SUBST(DIASUPP) dnl Checks for programs. AC_PATH_PROG(CC, m68k-palmos-gcc, no,$PATH:/usr/local/bin:\ --- 6,48 ---- dnl Special functions enabled + AC_MSG_CHECKING(if special functions are enabled) AC_ARG_ENABLE(specfun, ! AS_HELP_STRING([--enable-specfun],[include special functions (default = yes)]), ! [SPECFUN=$enable_specfun],[SPECFUN=yes;enable_specfun=yes]) ! AC_MSG_RESULT($enable_specfun) AC_SUBST(SPECFUN) + + dnl Graphics form and functions enabled + AC_MSG_CHECKING(if graphics form and functions are enabled) + AC_ARG_ENABLE(graphfun, + AS_HELP_STRING([--enable-graphfun],[include graphs (default = yes)]), + [GRAPHFUN=$enable_graphfun],[GRAPHFUN=yes;enable_graphfun=yes]) + AC_MSG_RESULT($enable_graphfun) + AC_SUBST(GRAPHFUN) + + dnl Dynamic Input Area support + AC_MSG_CHECKING(if Dynamic Input Area support is enabled) AC_ARG_ENABLE(diasupport, ! AS_HELP_STRING([--enable-diasupport],[include DIA support (default = yes)]), ! [DIASUPP=$enable_diasupport],[DIASUPP=yes;enable_diasupport=yes]) ! AC_MSG_RESULT($enable_diasupport) AC_SUBST(DIASUPP) + dnl Sony PalmOS4 hires support + AC_MSG_CHECKING(if Sony SDK is used) + AC_ARG_WITH(sonysdk, + AS_HELP_STRING([--with-sonysdk],[use Sony SDK for PalmOS4 hires support (default = no)]), + [SONYSDK=$with_sonysdk],[SONYSDK=no;with_sonysdk=no]) + AC_MSG_RESULT($with_sonysdk) + AC_SUBST(SONYSDK) + + dnl Handera QVGA support + AC_MSG_CHECKING(if Handera SDK is used) + AC_ARG_WITH(handerasdk, + AS_HELP_STRING([--with-handerasdk],[use Handera SDK for QVGA support (default = no)]), + [HANDERASDK=$with_handerasdk],[HANDERASDK=no;with_handerasdk=no]) + AC_MSG_RESULT($with_handerasdk) + AC_SUBST(HANDERASDK) + dnl Checks for programs. AC_PATH_PROG(CC, m68k-palmos-gcc, no,$PATH:/usr/local/bin:\ |
