From: Kevin M. Rosenberg Date: Sat, 11 Jan 2003 04:11:34 +0000 (+0000) Subject: r3739: *** empty log message *** X-Git-Tag: debian-4.5.3-3~145 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=92b40e557630881d08f67e2498b3e062ab8ec8ec r3739: *** empty log message *** --- diff --git a/configure b/configure index f466bd1..9a4b529 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.56. +# Generated by GNU Autoconf 2.57. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -970,7 +970,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.56. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -3389,6 +3389,8 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF @@ -3398,7 +3400,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -3490,6 +3496,8 @@ for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF @@ -3499,7 +3507,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#ifdef __STDC__ +# include +#else +# include +#endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 @@ -5927,13 +5939,13 @@ else fi wxwin=false -echo "$as_me:$LINENO: checking for main in -lwx_gtk-2.3" >&5 -echo $ECHO_N "checking for main in -lwx_gtk-2.3... $ECHO_C" >&6 -if test "${ac_cv_lib_wx_gtk_2_3_main+set}" = set; then +echo "$as_me:$LINENO: checking for main in -lwx_gtk-2.4" >&5 +echo $ECHO_N "checking for main in -lwx_gtk-2.4... $ECHO_C" >&6 +if test "${ac_cv_lib_wx_gtk_2_4_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lwx_gtk-2.3 $LIBS" +LIBS="-lwx_gtk-2.4 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -5963,19 +5975,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_wx_gtk_2_3_main=yes + ac_cv_lib_wx_gtk_2_4_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_wx_gtk_2_3_main=no +ac_cv_lib_wx_gtk_2_4_main=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_wx_gtk_2_3_main" >&5 -echo "${ECHO_T}$ac_cv_lib_wx_gtk_2_3_main" >&6 -if test $ac_cv_lib_wx_gtk_2_3_main = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_wx_gtk_2_4_main" >&5 +echo "${ECHO_T}$ac_cv_lib_wx_gtk_2_4_main" >&6 +if test $ac_cv_lib_wx_gtk_2_4_main = yes; then wxwin=true; wx_gtk=true; cat >>confdefs.h <<\_ACEOF #define HAVE_WXWINDOWS 1 @@ -5983,13 +5995,13 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for main in -lwx_mac-2.3" >&5 -echo $ECHO_N "checking for main in -lwx_mac-2.3... $ECHO_C" >&6 -if test "${ac_cv_lib_wx_mac_2_3_main+set}" = set; then +echo "$as_me:$LINENO: checking for main in -lwx_mac-2.4" >&5 +echo $ECHO_N "checking for main in -lwx_mac-2.4... $ECHO_C" >&6 +if test "${ac_cv_lib_wx_mac_2_4_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lwx_mac-2.3 $LIBS" +LIBS="-lwx_mac-2.4 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -6019,19 +6031,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_wx_mac_2_3_main=yes + ac_cv_lib_wx_mac_2_4_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_wx_mac_2_3_main=no +ac_cv_lib_wx_mac_2_4_main=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_wx_mac_2_3_main" >&5 -echo "${ECHO_T}$ac_cv_lib_wx_mac_2_3_main" >&6 -if test $ac_cv_lib_wx_mac_2_3_main = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_wx_mac_2_4_main" >&5 +echo "${ECHO_T}$ac_cv_lib_wx_mac_2_4_main" >&6 +if test $ac_cv_lib_wx_mac_2_4_main = yes; then wxwin=true; wx_gtk=true; cat >>confdefs.h <<\_ACEOF #define HAVE_WXWINDOWS 1 @@ -6883,8 +6895,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -6908,7 +6926,7 @@ char (*f) () = $ac_func; int main () { - +return f != $ac_func; ; return 0; } @@ -6954,8 +6972,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. */ -#include + which can conflict with char _doprnt (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -6979,7 +7003,7 @@ char (*f) () = _doprnt; int main () { - +return f != _doprnt; ; return 0; } @@ -7042,8 +7066,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7067,7 +7097,7 @@ char (*f) () = $ac_func; int main () { - +return f != $ac_func; ; return 0; } @@ -7116,8 +7146,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char basename (); below. */ -#include + which can conflict with char basename (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7141,7 +7177,7 @@ char (*f) () = basename; int main () { - +return f != basename; ; return 0; } @@ -7183,8 +7219,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setjmp (); below. */ -#include + which can conflict with char setjmp (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7208,7 +7250,7 @@ char (*f) () = setjmp; int main () { - +return f != setjmp; ; return 0; } @@ -7250,8 +7292,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setpriority (); below. */ -#include + which can conflict with char setpriority (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7275,7 +7323,7 @@ char (*f) () = setpriority; int main () { - +return f != setpriority; ; return 0; } @@ -7317,8 +7365,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char time (); below. */ -#include + which can conflict with char time (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7342,7 +7396,7 @@ char (*f) () = time; int main () { - +return f != time; ; return 0; } @@ -7384,8 +7438,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday (); below. */ -#include + which can conflict with char gettimeofday (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7409,7 +7469,7 @@ char (*f) () = gettimeofday; int main () { - +return f != gettimeofday; ; return 0; } @@ -7455,8 +7515,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getopt_long (); below. */ -#include + which can conflict with char getopt_long (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -7480,7 +7546,7 @@ char (*f) () = getopt_long; int main () { - +return f != getopt_long; ; return 0; } @@ -8382,8 +8448,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. */ -#include + which can conflict with char gethostbyname (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8407,7 +8479,7 @@ char (*f) () = gethostbyname; int main () { - +return f != gethostbyname; ; return 0; } @@ -8577,8 +8649,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. */ -#include + which can conflict with char connect (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8602,7 +8680,7 @@ char (*f) () = connect; int main () { - +return f != connect; ; return 0; } @@ -8706,8 +8784,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. */ -#include + which can conflict with char remove (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8731,7 +8815,7 @@ char (*f) () = remove; int main () { - +return f != remove; ; return 0; } @@ -8835,8 +8919,14 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. */ -#include + which can conflict with char shmat (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ +#ifdef __STDC__ +# include +#else +# include +#endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8860,7 +8950,7 @@ char (*f) () = shmat; int main () { - +return f != shmat; ; return 0; } @@ -9129,7 +9219,7 @@ echo "${ECHO_T}yes" >&6 if test "$libgl" = "true" ; then ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU" if test "$wxwin" = "true" ; then - ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.3" + ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4" fi fi if test "$wxwin" = "true" ; then @@ -9742,7 +9832,7 @@ _ASBOX cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.56. Invocation command line was +generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9805,7 +9895,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.56, +configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 diff --git a/configure.ac b/configure.ac index df1a103..8cbebb2 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,8 @@ AC_CHECK_LIB(readline, main, [readline=true; AC_DEFINE([HAVE_READLINE],1,[Readline library])], [readline=false], [-lcurses]) wxwin=false -AC_CHECK_LIB(wx_gtk-2.3, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])]) -AC_CHECK_LIB(wx_mac-2.3, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])]) +AC_CHECK_LIB(wx_gtk-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])]) +AC_CHECK_LIB(wx_mac-2.4, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS,1,[wxwindows library])]) AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW,1,[FFTW library])], [fftw=false]) AC_CHECK_LIB(GL, main, [libgl=true], [libgl=false], [-L/usr/X11R6/lib -lXt -lXext]) AC_CHECK_LIB(pthread, main, [pthread=true], [pthread=false]) @@ -336,7 +336,7 @@ if test "$no_x" != "yes" ; then if test "$libgl" = "true" ; then ctlib_graphics="$ctlib_graphics -lglut -lGL -lGLU" if test "$wxwin" = "true" ; then - ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.3" + ctlib_graphics="$ctlib_graphics -lwx_gtk_gl-2.4" fi fi if test "$wxwin" = "true" ; then diff --git a/debian/changelog b/debian/changelog index fae7697..233180d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -ctsim (3.6.2-2) unstable; urgency=low +ctsim (3.7.0-1) unstable; urgency=low * Rebuild with gcc3.2 * Update to wxwindows 2.4 + * Update to standards-version 3.5.8.0 -- Kevin M. Rosenberg Thu, 9 Jan 2003 17:14:38 -0700 diff --git a/debian/control b/debian/control index 7099f9f..520de09 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: science Priority: optional Maintainer: Kevin M. Rosenberg Build-Depends: debhelper (>= 4.0.0), wxwin2.4-headers, fftw-dev, libreadline4-dev, xlibmesa-dev, libwxgtk2.4-dev, glutg3-dev, ctn-dev, libpng12-0-dev -Standards-Version: 3.5.7.0 +Standards-Version: 3.5.8.0 Package: ctsim Architecture: any diff --git a/debian/copyright b/debian/copyright index 5905f38..597e3d2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,11 +5,6 @@ Upstream Source URL: ftp://ftp.ctsim.org Upstream Author: Kevin M. Rosenberg Debian Maintainer: (Same as upstream) -Since the upstream author is the same as the Debian maintainer, -there should be no divergence between the upstream package and -the Debian package. - - Upstream Copyright Statement ============================ CTSim is Copyright (C) 1983-2002 by Kevin M. Rosenberg, M.D.