mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' into 'master' 

Do not use fixed python executable name and use AM_PROG_PYTHON

See merge request sane-project/backends!525
merge-requests/540/head
Olaf Meeuwissen 2020-09-17 11:41:31 +00:00
rodzic b89b9b1350 924dcf0731
commit ddcfa6a12f
2 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
backend/Makefile.am
Wyświetl plik

@ -947,10 +947,10 @@ $(srcdir)/pixma/pixma.c: \
$(srcdir)/pixma/pixma_sane_options.h: $(srcdir)/pixma/pixma_sane_options.h:
@echo Generating $@ from $(@D)/pixma.c @echo Generating $@ from $(@D)/pixma.c
@(cd $(@D); python scripts/pixma_gen_options.py h < pixma.c > $(@F)) @(cd $(@D); $(PYTHON) scripts/pixma_gen_options.py h < pixma.c > $(@F))
$(srcdir)/pixma/pixma_sane_options.c: $(srcdir)/pixma/pixma_sane_options.c:
@echo Generating $@ from $(@D)/pixma.c @echo Generating $@ from $(@D)/pixma.c
@(cd $(@D); python scripts/pixma_gen_options.py < pixma.c > $(@F)) @(cd $(@D); $(PYTHON) scripts/pixma_gen_options.py < pixma.c > $(@F))
EXTRA_DIST += pixma/pixma_sane_options.c EXTRA_DIST += pixma/pixma_sane_options.c
EXTRA_DIST += pixma/pixma_sane_options.h EXTRA_DIST += pixma/pixma_sane_options.h

1
configure.ac
Wyświetl plik

@ -36,6 +36,7 @@ dnl ******************************************************************
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AM_PROG_CC_C_O AM_PROG_CC_C_O
AM_PATH_PYTHON(2.7)
sane_save_CC=$CC sane_save_CC=$CC
AC_PROG_CC_C99 dnl enables extensions to ISO C99 :-( AC_PROG_CC_C99 dnl enables extensions to ISO C99 :-(
AS_IF([test xno != "x$ac_cv_prog_cc_c99"], AS_IF([test xno != "x$ac_cv_prog_cc_c99"],