Refresh patch and add variables
Daniel Echeverri
2 years ago
| 0 | 0 | Description: Force to exit if doesn't have dependencies to build xhydra. |
| 1 | 1 | Forwarded: not-need |
| 2 | 2 | Author: epsilon@debian.org |
| 3 | Last-Update: 2022-03-26 | |
| 4 | --- a/configure | |
| 5 | +++ b/configure | |
| 6 | @@ -1312,7 +1312,8 @@ | |
| 7 | XHYDRA_SUPPORT="" | |
| 8 | fi | |
| 9 | if [ "X" = "X$XHYDRA_SUPPORT" ]; then | |
| 10 | - echo " ... NOT found, optional anyway" | |
| 11 | + echo " ... NOT found.. gtk+-2.0 is necessary for xhydra, please install it." | |
| 12 | + exit 1 | |
| 13 | else | |
| 14 | echo " ... found" | |
| 15 | fi | |
| 3 | Last-Update: 2022-04-16 | |
| 4 | --- a/Makefile.am | |
| 5 | +++ b/Makefile.am | |
| 6 | @@ -58,10 +58,10 @@ | |
| 7 | @echo | |
| 8 | ||
| 9 | xhydra: | |
| 10 | - -cd hydra-gtk && sh ./make_xhydra.sh | |
| 11 | + cd hydra-gtk && sh ./make_xhydra.sh $(DEB_HOST_GNU_TYPE) $(DEB_BUILD_GNU_TYPE) | |
| 12 | ||
| 13 | pw-inspector: pw-inspector.c | |
| 14 | - -$(CC) $(OPTS) $(SEC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o pw-inspector $(PWI_LOGO) pw-inspector.c | |
| 15 | + $(CC) $(OPTS) $(SEC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o pw-inspector $(PWI_LOGO) pw-inspector.c | |
| 16 | ||
| 17 | .c.o: | |
| 18 | $(CC) $(OPTS) $(SEC) $(CFLAGS) $(CPPFLAGS) -c $< $(XDEFINES) $(XIPATHS) | |
| 19 | --- a/hydra-gtk/make_xhydra.sh | |
| 20 | +++ b/hydra-gtk/make_xhydra.sh | |
| 21 | @@ -2,7 +2,7 @@ | |
| 22 | PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig | |
| 23 | export PKG_CONFIG_PATH | |
| 24 | echo "Trying to compile xhydra now (hydra gtk gui) - don't worry if this fails, this is really optional ..." | |
| 25 | -./configure | |
| 26 | +./configure --host=$1 --build=$2 | |
| 27 | test -e Makefile || { | |
| 28 | echo "Error: configure wasnt happy. Analyse this:" | |
| 29 | exit 1 |