rev 273 - in trunk: . include
SVN User <[email protected]>
| Newsgroups | gmane.comp.lang.prothon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bcollins
Date: 2004-04-04 11:08:52 -0400 (Sun, 04 Apr 2004)
New Revision: 273
Modified:
trunk/configure
trunk/configure.in
trunk/include/config.h.in
Log:
Use standard PACKAGE_VERSION instead of VERSION.
Modified: trunk/configure
===================================================================
--- trunk/configure 2004-04-04 15:08:09 UTC (rev 272)
+++ trunk/configure 2004-04-04 15:08:52 UTC (rev 273)
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-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 VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC PROTHON_DEFAULT_MODDIR HAVE_BOOST_REGEX BOOST_REGEX_LIBS LINK_LD LINK_LIBTOOL LIBOBJS LTLIBOBJS'
+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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC PROTHON_DEFAULT_MODDIR HAVE_BOOST_REGEX BOOST_REGEX_LIBS LINK_LD LINK_LIBTOOL LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1955,14 +1955,8 @@
-VERSION="0.0"
+PACKAGE_VERSION="0.0"
-cat >>confdefs.h <<_ACEOF
-#define VERSION "${VERSION}"
-_ACEOF
-
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3511,7 +3505,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3514 "configure"' > conftest.$ac_ext
+ echo '#line 3508 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4966,7 +4960,7 @@
# Provide some information about the compiler.
-echo "$as_me:4969:" \
+echo "$as_me:4963:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6002,11 +5996,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6005: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5999: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6009: \$? = $ac_status" >&5
+ echo "$as_me:6003: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6235,11 +6229,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6238: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6232: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6242: \$? = $ac_status" >&5
+ echo "$as_me:6236: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6295,11 +6289,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6298: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6292: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6302: \$? = $ac_status" >&5
+ echo "$as_me:6296: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8470,7 +8464,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8473 "configure"
+#line 8467 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8568,7 +8562,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8571 "configure"
+#line 8565 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10749,11 +10743,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10752: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10746: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10756: \$? = $ac_status" >&5
+ echo "$as_me:10750: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10809,11 +10803,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10812: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10806: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10816: \$? = $ac_status" >&5
+ echo "$as_me:10810: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12163,7 +12157,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12166 "configure"
+#line 12160 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12261,7 +12255,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12264 "configure"
+#line 12258 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13088,11 +13082,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13091: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13085: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13095: \$? = $ac_status" >&5
+ echo "$as_me:13089: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13148,11 +13142,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13151: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13145: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13155: \$? = $ac_status" >&5
+ echo "$as_me:13149: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15184,11 +15178,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15187: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15181: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15191: \$? = $ac_status" >&5
+ echo "$as_me:15185: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15417,11 +15411,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15420: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15414: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15424: \$? = $ac_status" >&5
+ echo "$as_me:15418: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15477,11 +15471,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15480: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15474: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15484: \$? = $ac_status" >&5
+ echo "$as_me:15478: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17652,7 +17646,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17655 "configure"
+#line 17649 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17750,7 +17744,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17753 "configure"
+#line 17747 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18887,7 +18881,7 @@
CFLAGS="$CFLAGS -Wall"
-PROTHON_DEFAULT_MODDIR="${libdir}/prothon-${VERSION}"
+PROTHON_DEFAULT_MODDIR="${libdir}/prothon-${PACKAGE_VERSION}"
HAVE_BOOST_REGEX=no
@@ -19997,7 +19991,6 @@
s,@ECHO_N@,$ECHO_N,;t t
s,@ECHO_T@,$ECHO_T,;t t
s,@LIBS@,$LIBS,;t t
-s,@VERSION@,$VERSION,;t t
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2004-04-04 15:08:09 UTC (rev 272)
+++ trunk/configure.in 2004-04-04 15:08:52 UTC (rev 273)
@@ -7,9 +7,7 @@
sinclude(ac-macros/find_apr.m4)
sinclude(ac-macros/libtool.m4)
-VERSION="0.0"
-AC_DEFINE_UNQUOTED([VERSION], ["${VERSION}"], [Prothon Version])
-AC_SUBST(VERSION)
+PACKAGE_VERSION="0.0"
AC_PROG_CC
AC_PROG_LIBTOOL
@@ -18,7 +16,7 @@
CFLAGS="$CFLAGS -Wall"
-PROTHON_DEFAULT_MODDIR="${libdir}/prothon-${VERSION}"
+PROTHON_DEFAULT_MODDIR="${libdir}/prothon-${PACKAGE_VERSION}"
AC_SUBST(PROTHON_DEFAULT_MODDIR)
HAVE_BOOST_REGEX=no
Modified: trunk/include/config.h.in
===================================================================
--- trunk/include/config.h.in 2004-04-04 15:08:09 UTC (rev 272)
+++ trunk/include/config.h.in 2004-04-04 15:08:52 UTC (rev 273)
@@ -50,6 +50,3 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-
-/* Prothon Version */
-#undef VERSION