Browse code

fix quoting of version.

git-svn: trunk@3565

Török Edvin authored on 2008/01/31 06:33:27
Showing 4 changed files
... ...
@@ -1,3 +1,7 @@
1
+Wed Jan 30 23:13:19 EET 2008 (edwin)
2
+------------------------------------
3
+ * configure.in,configure: fix quoting of version.
4
+
1 5
 Wed Jan 30 22:52:54 EET 2008 (edwin)
2 6
 ------------------------------------
3 7
  * configure.in,configure: add AC_C_RESTRICT (bb #452)
... ...
@@ -306,7 +306,7 @@
306 306
 /* "no fd_set" */
307 307
 #undef NO_FD_SET
308 308
 
309
-/* package name */
309
+/* Name of package */
310 310
 #undef PACKAGE
311 311
 
312 312
 /* Define to the address where bug reports for this package should be sent. */
... ...
@@ -360,7 +360,7 @@
360 360
 /* use syslog */
361 361
 #undef USE_SYSLOG
362 362
 
363
-/* package version */
363
+/* Version number of package */
364 364
 #undef VERSION
365 365
 
366 366
 /* tcpwrappers support */
... ...
@@ -3855,9 +3855,10 @@ cat >>confdefs.h <<\_ACEOF
3855 3855
 _ACEOF
3856 3856
 
3857 3857
 
3858
+VERSION="devel-`date +%Y%m%d`"
3858 3859
 
3859
-cat >>confdefs.h <<\_ACEOF
3860
-#define VERSION "devel-`date +%Y%m%d`"
3860
+cat >>confdefs.h <<_ACEOF
3861
+#define VERSION "$VERSION"
3861 3862
 _ACEOF
3862 3863
 
3863 3864
 
... ...
@@ -4746,7 +4747,7 @@ ia64-*-hpux*)
4746 4746
   ;;
4747 4747
 *-*-irix6*)
4748 4748
   # Find out which ABI we are using.
4749
-  echo '#line 4749 "configure"' > conftest.$ac_ext
4749
+  echo '#line 4750 "configure"' > conftest.$ac_ext
4750 4750
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4751 4751
   (eval $ac_compile) 2>&5
4752 4752
   ac_status=$?
... ...
@@ -6521,11 +6522,11 @@ else
6521 6521
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6522 6522
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6523 6523
    -e 's:$: $lt_compiler_flag:'`
6524
-   (eval echo "\"\$as_me:6524: $lt_compile\"" >&5)
6524
+   (eval echo "\"\$as_me:6525: $lt_compile\"" >&5)
6525 6525
    (eval "$lt_compile" 2>conftest.err)
6526 6526
    ac_status=$?
6527 6527
    cat conftest.err >&5
6528
-   echo "$as_me:6528: \$? = $ac_status" >&5
6528
+   echo "$as_me:6529: \$? = $ac_status" >&5
6529 6529
    if (exit $ac_status) && test -s "$ac_outfile"; then
6530 6530
      # The compiler can only warn and ignore the option if not recognized
6531 6531
      # So say no if there are warnings other than the usual output.
... ...
@@ -6811,11 +6812,11 @@ else
6811 6811
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6812 6812
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6813 6813
    -e 's:$: $lt_compiler_flag:'`
6814
-   (eval echo "\"\$as_me:6814: $lt_compile\"" >&5)
6814
+   (eval echo "\"\$as_me:6815: $lt_compile\"" >&5)
6815 6815
    (eval "$lt_compile" 2>conftest.err)
6816 6816
    ac_status=$?
6817 6817
    cat conftest.err >&5
6818
-   echo "$as_me:6818: \$? = $ac_status" >&5
6818
+   echo "$as_me:6819: \$? = $ac_status" >&5
6819 6819
    if (exit $ac_status) && test -s "$ac_outfile"; then
6820 6820
      # The compiler can only warn and ignore the option if not recognized
6821 6821
      # So say no if there are warnings other than the usual output.
... ...
@@ -6915,11 +6916,11 @@ else
6915 6915
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6916 6916
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6917 6917
    -e 's:$: $lt_compiler_flag:'`
6918
-   (eval echo "\"\$as_me:6918: $lt_compile\"" >&5)
6918
+   (eval echo "\"\$as_me:6919: $lt_compile\"" >&5)
6919 6919
    (eval "$lt_compile" 2>out/conftest.err)
6920 6920
    ac_status=$?
6921 6921
    cat out/conftest.err >&5
6922
-   echo "$as_me:6922: \$? = $ac_status" >&5
6922
+   echo "$as_me:6923: \$? = $ac_status" >&5
6923 6923
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
6924 6924
    then
6925 6925
      # The compiler can only warn and ignore the option if not recognized
... ...
@@ -9277,7 +9278,7 @@ else
9277 9277
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9278 9278
   lt_status=$lt_dlunknown
9279 9279
   cat > conftest.$ac_ext <<EOF
9280
-#line 9280 "configure"
9280
+#line 9281 "configure"
9281 9281
 #include "confdefs.h"
9282 9282
 
9283 9283
 #if HAVE_DLFCN_H
... ...
@@ -9377,7 +9378,7 @@ else
9377 9377
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9378 9378
   lt_status=$lt_dlunknown
9379 9379
   cat > conftest.$ac_ext <<EOF
9380
-#line 9380 "configure"
9380
+#line 9381 "configure"
9381 9381
 #include "confdefs.h"
9382 9382
 
9383 9383
 #if HAVE_DLFCN_H
... ...
@@ -38,10 +38,11 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 no-define])
38 38
 
39 39
 dnl we told automake to not define these, since we want to include
40 40
 dnl the date in the version
41
-AC_DEFINE(PACKAGE, PACKAGE_NAME, [package name])
41
+AC_DEFINE(PACKAGE, PACKAGE_NAME, [Name of package])
42 42
 
43 43
 dnl change this on a release
44
-AC_DEFINE(VERSION,["devel-`date +%Y%m%d`"],[package version])
44
+VERSION="devel-`date +%Y%m%d`"
45
+AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version number of package])
45 46
 
46 47
 LC_CURRENT=3
47 48
 LC_REVISION=3