Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(161)

Delta Between Two Patch Sets: aclocal.m4

Issue 545370043: Switch to Python 3.x (Closed)
Left Patch Set: Created 4 years, 3 months ago
Right Patch Set: Rebase Created 4 years, 1 month ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | configure.ac » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 dnl aclocal.m4 -*-shell-script-*- 1 dnl aclocal.m4 -*-shell-script-*-
2 dnl StepMake subroutines for configure.ac 2 dnl StepMake subroutines for configure.ac
3 3
4 4
5 ### mostly internal macros 5 ### mostly internal macros
6 6
7 # Get full path of executable ($1) 7 # Get full path of executable ($1)
8 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [ 8 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
9 ## which doesn't work in ash, if /usr/bin/which isn't installed 9 ## which doesn't work in ash, if /usr/bin/which isn't installed
10 ## type -p doesn't work in ash 10 ## type -p doesn't work in ash
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 AC_SUBST(CXXFLAGS) 347 AC_SUBST(CXXFLAGS)
348 ]) 348 ])
349 349
350 350
351 AC_DEFUN(STEPMAKE_DATADIR, [ 351 AC_DEFUN(STEPMAKE_DATADIR, [
352 presome=${prefix} 352 presome=${prefix}
353 if test "$prefix" = "NONE"; then 353 if test "$prefix" = "NONE"; then
354 presome=${ac_default_prefix} 354 presome=${ac_default_prefix}
355 fi 355 fi
356 356
357 build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$ package 357 build_package_datadir=$ac_pwd/out$CONFIGSUFFIX/share/$package
358 358
359 DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${presome}/share!"` 359 DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${presome}/share!"`
360 DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"` 360 DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
361 BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$ presome!"` 361 BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$ presome!"`
362 362
363 AC_SUBST(datadir) 363 AC_SUBST(datadir)
364 AC_SUBST(datarootdir) 364 AC_SUBST(datarootdir)
365 AC_SUBST(build_package_datadir) 365 AC_SUBST(build_package_datadir)
366 AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"]) 366 AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
367 AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"]) 367 AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
368 ]) 368 ])
369 369
370 370
371 ## ugh: cut & paste programming from datadir. 371 ## ugh: cut & paste programming from datadir.
372 AC_DEFUN(STEPMAKE_LIBDIR, [ 372 AC_DEFUN(STEPMAKE_LIBDIR, [
373 presome=${exec_prefix} 373 presome=${exec_prefix}
374 if test "$presome" = "NONE"; then 374 if test "$presome" = "NONE"; then
375 presome=${prefix} 375 presome=${prefix}
376 fi 376 fi
377 if test "$presome" = "NONE"; then 377 if test "$presome" = "NONE"; then
378 presome=${ac_default_prefix} 378 presome=${ac_default_prefix}
379 fi 379 fi
380 380
381 build_package_libdir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/lib/$pac kage 381 build_package_libdir=$ac_pwd/out$CONFIGSUFFIX/lib/$package
382 382
383 LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"` 383 LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
384 BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix }!$presome!"` 384 BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_prefix }!$presome!"`
385 385
386 AC_SUBST(libdir) 386 AC_SUBST(libdir)
387 AC_SUBST(build_package_libdir) 387 AC_SUBST(build_package_libdir)
388 AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"]) 388 AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
389 AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"]) 389 AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
390 ]) 390 ])
391 391
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 STEPMAKE_ADD_ENTRY($1, $warn) 828 STEPMAKE_ADD_ENTRY($1, $warn)
829 fi 829 fi
830 fi 830 fi
831 # no else, we're fine with any clang 831 # no else, we're fine with any clang
832 ]) 832 ])
833 833
834 834
835 AC_DEFUN(STEPMAKE_INIT, [ 835 AC_DEFUN(STEPMAKE_INIT, [
836 . $srcdir/VERSION 836 . $srcdir/VERSION
837 FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL 837 FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
838 MICRO_VERSION=$PATCH_LEVEL
839 TOPLEVEL_VERSION=$FULL_VERSION 838 TOPLEVEL_VERSION=$FULL_VERSION
840 if test x$MY_PATCH_LEVEL != x; then 839 if test x$MY_PATCH_LEVEL != x; then
841 FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL 840 FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
842 fi 841 fi
843 VERSION=$FULL_VERSION 842 VERSION=$FULL_VERSION
844 export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL 843 export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL
845 # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:]
846 changequote(<<, >>)#dnl
847 PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'`
848 package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
849 changequote([, ])#dnl
850
851 # No versioning on directory names of sub-packages
852 # urg, urg
853 stepmake=${datadir}/stepmake
854 presome=${prefix}
855 if test "$prefix" = "NONE"; then
856 presome=${ac_default_prefix}
857 fi
858 stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"`
859 844
860 # urg, how is this supposed to work? 845 # urg, how is this supposed to work?
861 if test "$program_prefix" = "NONE"; then 846 if test "$program_prefix" = "NONE"; then
862 program_prefix= 847 program_prefix=
863 fi 848 fi
864 if test "$program_suffix" = "NONE"; then 849 if test "$program_suffix" = "NONE"; then
865 program_suffix= 850 program_suffix=
866 fi 851 fi
867 852
868 AC_MSG_CHECKING(Package) 853 # From configure: "When building in place, set srcdir=."·
869 if test "$PACKAGE" = "STEPMAKE"; then 854 if test "$srcdir" = "."; then
870 AC_MSG_RESULT(Stepmake package!) 855 srcdir_build=yes
871 856 else
872 AC_MSG_CHECKING(builddir) 857 srcdir_build=no
873 858 fi
874 ugh_ugh_autoconf250_builddir="`pwd`" 859
875
876 if test "$srcdir" = "."; then
877 srcdir_build=yes
878 else
879 srcdir_build=no
880 package_builddir="`dirname $ugh_ugh_autoconf250_builddir`"
881 package_srcdir="`dirname $srcdir`"
882 fi
883 AC_MSG_RESULT($ugh_ugh_autoconf250_builddir)
884
885 (cd stepmake 2>/dev/null || mkdir stepmake)
886 (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .)
887 stepmake=stepmake
888 else
889 AC_MSG_RESULT($PACKAGE)
890
891 AC_MSG_CHECKING(builddir)
892 ugh_ugh_autoconf250_builddir="`pwd`"
893
894 here_dir=$(cd . && pwd)
895 full_src_dir=$(cd $srcdir && pwd)
896
897 if test "$full_src_dir" = "$here_dir"; then
898 srcdir_build=yes
899 else
900 srcdir_build=no
901 fi
902 AC_MSG_RESULT($ugh_ugh_autoconf250_builddir)
903
904 AC_MSG_CHECKING(for stepmake)
905 # Check for installed stepmake
906 if test -d $stepmake; then
907 AC_MSG_RESULT($stepmake)
908 else
909 stepmake="`cd $srcdir/stepmake; pwd`"
910 AC_MSG_RESULT([$srcdir/stepmake ($datadir/stepmake not found)])
911 fi
912 fi
913
914 AC_SUBST(ugh_ugh_autoconf250_builddir)
915
916 # Use absolute directory for non-srcdir builds, so that build
917 # dir can be moved.
918 if test "$srcdir_build" = "no" ; then
919 srcdir="`cd $srcdir; pwd`"
920 fi
921
922 AC_SUBST(srcdir)
923 AC_SUBST(stepmake)
924 AC_SUBST(package)
925 AC_SUBST(PACKAGE)
926 AC_SUBST(PACKAGE_NAME)
927 AC_SUBST(VERSION) 860 AC_SUBST(VERSION)
928 AC_SUBST(MAJOR_VERSION) 861 AC_SUBST(MAJOR_VERSION)
929 AC_SUBST(MINOR_VERSION) 862 AC_SUBST(MINOR_VERSION)
930 AC_SUBST(MICRO_VERSION)
931 863
932 # stepmake nonstandard names 864 # stepmake nonstandard names
933 AC_SUBST(PATCH_LEVEL) 865 AC_SUBST(PATCH_LEVEL)
934 AC_SUBST(TOPLEVEL_VERSION) 866 AC_SUBST(TOPLEVEL_VERSION)
935
936 # We don't need the upper case variant,
937 # so stick to macros are uppercase convention.
938 # AC_DEFINE_UNQUOTED(package, ["${package}"])
939 # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"])
940 AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"])
941
942 # ugh: PACKAGE_NAME is already defined by AC_INIT,
943 # which we call without arguments for historical reasons.
944 AS_ECHO([["#undef PACKAGE_NAME"]]) >> confdefs.h
945
946 AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"])
947 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"])
948
949 if test -z "$package_depth"; then
950 package_depth="."
951 else
952 package_depth="../$package_depth"
953 fi
954 export package_depth
955 AC_SUBST(package_depth)
956 867
957 AUTOGENERATE="This file was automatically generated by configure" 868 AUTOGENERATE="This file was automatically generated by configure"
958 AC_SUBST(AUTOGENERATE) 869 AC_SUBST(AUTOGENERATE)
959 870
960 CONFIGSUFFIX= 871 CONFIGSUFFIX=
961 AC_ARG_ENABLE(config, 872 AC_ARG_ENABLE(config,
962 [AS_HELP_STRING( 873 [AS_HELP_STRING(
963 [--enable-config=CONF], 874 [--enable-config=CONF],
964 [put settings in config-CONF.make and config-CONF.h; 875 [put settings in config-CONF.make and config-CONF.h;
965 do `make conf=CONF' to get output in ./out-CONF])], 876 do `make conf=CONF' to get output in ./out-CONF])],
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 if test "$CYGWIN$MINGW32" = "nono"; then 1417 if test "$CYGWIN$MINGW32" = "nono"; then
1507 PLATFORM_WINDOWS=no 1418 PLATFORM_WINDOWS=no
1508 else 1419 else
1509 PLATFORM_WINDOWS=yes 1420 PLATFORM_WINDOWS=yes
1510 fi 1421 fi
1511 AC_MSG_RESULT([$PLATFORM_WINDOWS]) 1422 AC_MSG_RESULT([$PLATFORM_WINDOWS])
1512 AC_SUBST(PLATFORM_WINDOWS) 1423 AC_SUBST(PLATFORM_WINDOWS)
1513 STEPMAKE_PROGS(WINDRES, $target-windres windres, x) 1424 STEPMAKE_PROGS(WINDRES, $target-windres windres, x)
1514 AC_SUBST(WINDRES) 1425 AC_SUBST(WINDRES)
1515 ]) 1426 ])
LEFTRIGHT
« no previous file | configure.ac » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b