Skip to content

Commit dcc2ba9

Browse files
author
Erlend E. Aasland
committed
Try to minimise configure diffs
1 parent c81a3dc commit dcc2ba9

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

configure

+7-7
Original file line numberDiff line numberDiff line change
@@ -11023,9 +11023,9 @@ fi
1102311023
as_fn_append LIBSQLITE3_CFLAGS ' -I$(srcdir)/Modules/_sqlite'
1102411024

1102511025
save_CFLAGS=$CFLAGS
11026-
save_CPPFLAGS=$CPPFLAGS
11027-
save_LDFLAGS=$LDFLAGS
11028-
save_LIBS=$LIBS
11026+
save_CPPFLAGS=$CPPFLAGS
11027+
save_LDFLAGS=$LDFLAGS
11028+
save_LIBS=$LIBS
1102911029

1103011030
CPPFLAGS="$LIBSQLITE3_CFLAGS $CFLAGS"
1103111031
LDFLAGS="$LIBSQLITE3_LIBS $LDFLAGS"
@@ -11151,10 +11151,10 @@ fi
1115111151

1115211152

1115311153

11154-
CFLAGS=$save_CFLAGS
11155-
CPPFLAGS=$save_CPPFLAGS
11156-
LDFLAGS=$save_LDFLAGS
11157-
LIBS=$save_LIBS
11154+
CFLAGS=$save_CFLAGS
11155+
CPPFLAGS=$save_CPPFLAGS
11156+
LDFLAGS=$save_LDFLAGS
11157+
LIBS=$save_LIBS
1115811158

1115911159

1116011160

configure.ac

+11-11
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ dnl - WITH_SAVE_ENV([SCRIPT]) Runs SCRIPT wrapped with SAVE_ENV/RESTORE_ENV
3232
AC_DEFUN([_SAVE_VAR], [AS_VAR_COPY([save_][$1], [$1])])dnl
3333
AC_DEFUN([_RESTORE_VAR], [AS_VAR_COPY([$1], [save_][$1])])dnl
3434
AC_DEFUN([SAVE_ENV],
35-
[_SAVE_VAR([CFLAGS])]
36-
[_SAVE_VAR([CPPFLAGS])]
37-
[_SAVE_VAR([LDFLAGS])]
38-
[_SAVE_VAR([LIBS])]
35+
[_SAVE_VAR([CFLAGS])]
36+
[_SAVE_VAR([CPPFLAGS])]
37+
[_SAVE_VAR([LDFLAGS])]
38+
[_SAVE_VAR([LIBS])]
3939
)dnl
4040
AC_DEFUN([RESTORE_ENV],
41-
[_RESTORE_VAR([CFLAGS])]
42-
[_RESTORE_VAR([CPPFLAGS])]
43-
[_RESTORE_VAR([LDFLAGS])]
44-
[_RESTORE_VAR([LIBS])]
41+
[_RESTORE_VAR([CFLAGS])]
42+
[_RESTORE_VAR([CPPFLAGS])]
43+
[_RESTORE_VAR([LDFLAGS])]
44+
[_RESTORE_VAR([LIBS])]
4545
)dnl
4646
AC_DEFUN([WITH_SAVE_ENV],
47-
[SAVE_ENV]
48-
[$1]
49-
[RESTORE_ENV]
47+
[SAVE_ENV]
48+
[$1]
49+
[RESTORE_ENV]
5050
)dnl
5151

5252
AC_SUBST(BASECPPFLAGS)

0 commit comments

Comments
 (0)