[postgis-tickets] r15682 - always enable loader cunit tests

[Regina Obe]

Author: robe
Date: 2017-09-11 08:16:01 -0700 (Mon, 11 Sep 2017)
New Revision: 15682

Modified:
   branches/2.3/loader/Makefile.in
Log:
always enable loader cunit tests
References #3839

Modified: branches/2.3/loader/Makefile.in
===================================================================
--- branches/2.3/loader/Makefile.in	2017-09-11 14:34:44 UTC (rev 15681)
+++ branches/2.3/loader/Makefile.in	2017-09-11 15:16:01 UTC (rev 15682)
@@ -12,7 +12,7 @@
 # PGXS information
 #
 # Note that PGXS currently doesn't handle building FE executables, but we need
-# the DESTDIR variable so we can get the correct install paths. 
+# the DESTDIR variable so we can get the correct install paths.
 # Hence we include the PGXS Makefile here, but ensure that we override the
 # 'all' and 'install' targets with the ones we really want to use below.
 PG_CONFIG = @PG_CONFIG@
@@ -20,7 +20,7 @@
 include $(PGXS)
 
 # Set CFLAGS afer PGXS, otherwise it will get overwritten with the PGXS
-# version which is not what we want. 
+# version which is not what we want.
 CC=@CC@
 CFLAGS=-I ../liblwgeom @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @PROJ_CPPFLAGS@
 top_builddir = @top_builddir@
@@ -81,8 +81,8 @@
 shp2pgsql-gui.res: shp2pgsql-gui.rc shp2pgsql-gui.ico
 	windres $< -O coff -o $@
 
-# liblwgeom.a dependency to allow "make install" in 
-# the loader/ subdirectory to work  
+# liblwgeom.a dependency to allow "make install" in
+# the loader/ subdirectory to work
 $(LIBLWGEOM):
 	$(MAKE) -C ../liblwgeom
 
@@ -95,11 +95,11 @@
 pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2shp-core.h shpcommon.h
 	$(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $<
 
-$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM) 
+$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CFLAGS) $^ $(LDFLAGS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(GETTEXT_LDFLAGS) -o $@
 
-$(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) 
+$(SHP2PGSQL-CLI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM)
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(GETTEXT_LDFLAGS) $(ICONV_LDFLAGS)
 
@@ -153,9 +153,7 @@
 	$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)"
 
 check:
-ifdef gtk_build
 	$(MAKE) -C cunit check
-endif
 
 clean:
 	rm -rf .libs
@@ -168,10 +166,10 @@
 
 
 #
-# Internationalization targets. These are going to need some work and 
+# Internationalization targets. These are going to need some work and
 # love to land the files in the right places in all platforms.
 #
-pot: 
+pot:
 	xgettext -k_ shp2pgsql-core.c shp2pgsql-cli.c shp2pgsql-gui.c -o po/shp2pgsql.pot
 	xgettext -k_ pgsql2shp-core.c pgsql2shp-cli.c -o po/pgsql2shp.pot