[spatialite-gui] 01/10: Imported Upstream version 2.0.0~devel1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Jun 27 20:41:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository spatialite-gui.
commit 4daaf6c0bb5793adcf87e97d60856d63ba6fc763
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jun 27 16:37:23 2015 +0200
Imported Upstream version 2.0.0~devel1
---
Dialogs.cpp | 2 +-
Exif.cpp | 2 +-
Main.cpp | 22 +++++++++-----
Makefile.am | 4 +--
Makefile.in | 12 ++++----
MalformedGeoms.cpp | 2 +-
Styles.cpp | 17 +++++------
TableTree.cpp | 4 +--
VectorSymbolizers2.cpp | 4 +--
config.h.in | 9 ++++++
configure | 76 ++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 8 +++--
gnome_resource/Makefile.in | 4 +--
icons/Makefile.in | 4 +--
mac_resource/Makefile.in | 4 +--
win_resource/Makefile.in | 4 +--
16 files changed, 135 insertions(+), 43 deletions(-)
diff --git a/Dialogs.cpp b/Dialogs.cpp
index e033667..bdec747 100644
--- a/Dialogs.cpp
+++ b/Dialogs.cpp
@@ -5576,7 +5576,7 @@ void AutoSaveDialog::OnChangePath(wxCommandEvent & WXUNUSED(event))
MainFrame->SetExternalSqlitePath(pth);
if (MainFrame->MemoryDbSave() == true)
{
- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
wxFileName file(fileDialog.GetPath());
lastDir = file.GetPath();
diff --git a/Exif.cpp b/Exif.cpp
index a70923c..3e51fbb 100644
--- a/Exif.cpp
+++ b/Exif.cpp
@@ -64,7 +64,7 @@ void MyFrame::ImportExifPhotos(wxString & path, bool folder, bool metadata,
else
cnt = ExifLoadFile(path, gps_only, metadata);
::wxEndBusyCursor();
- sprintf(msg, "%d EXIF photo%s succesfully inserted into the DB\n", cnt,
+ sprintf(msg, "%d EXIF photo%s successfully inserted into the DB\n", cnt,
(cnt > 1) ? "s where" : " was");
wxMessageBox(wxString::FromUTF8(msg), wxT("spatialite_gui"),
wxOK | wxICON_INFORMATION, this);
diff --git a/Main.cpp b/Main.cpp
index 4c347a1..0864acd 100644
--- a/Main.cpp
+++ b/Main.cpp
@@ -1072,9 +1072,11 @@ void MyFrame::OnAttachDatabase(wxCommandEvent & WXUNUSED(event))
wxString lastDir;
wxString path;
wxString suffixList =
- wxT("SpatiaLite DB (*.sqlite;*.atlas;*.gpkg)|*.sqlite;*.atlas;*.gpkg|");
+ wxT
+ ("SpatiaLite DB (*.sqlite;*.atlas;*.db;*.gpkg)|*.sqlite;*.atlas;*.db;*.gpkg|");
suffixList += wxT("SQLite DB (*.sqlite)|*.sqlite|");
suffixList += wxT("LibreAtlas DB (*.atlas)|*.atlas|");
+ suffixList += wxT("SQLite DB (*.db)|*.db|");
suffixList += wxT("OGC GeoPackage (*.gpkg)|*.gpkg|");
suffixList += wxT("All files (*.*)|*.*");
wxFileDialog fileDialog(this, wxT("Attach DataBase"),
@@ -1491,9 +1493,11 @@ void MyFrame::OnConnect(wxCommandEvent & WXUNUSED(event))
int ret;
wxString lastDir;
wxString suffixList =
- wxT("SpatiaLite DB (*.sqlite;*.atlas;*.gpkg)|*.sqlite;*.atlas;*.gpkg|");
+ wxT
+ ("SpatiaLite DB (*.sqlite;*.atlas;*.db;*.gpkg)|*.sqlite;*.atlas;*.db;*.gpkg|");
suffixList += wxT("SQLite DB (*.sqlite)|*.sqlite|");
suffixList += wxT("LibreAtlas DB (*.atlas)|*.atlas|");
+ suffixList += wxT("SQLite DB (*.db)|*.db|");
suffixList += wxT("OGC GeoPackage (*.gpkg)|*.gpkg|");
suffixList += wxT("All files (*.*)|*.*");
wxFileDialog fileDialog(this, wxT("DB connection"),
@@ -1692,9 +1696,11 @@ void MyFrame::OnConnectReadOnly(wxCommandEvent & WXUNUSED(event))
int ret;
wxString lastDir;
wxString suffixList =
- wxT("SpatiaLite DB (*.sqlite;*.atlas;*.gpkg)|*.sqlite;*.atlas;*.gpkg|");
+ wxT
+ ("SpatiaLite DB (*.sqlite;*.atlas;*.db;*.gpkg)|*.sqlite;*.atlas;*.db;*.gpkg|");
suffixList += wxT("SQLite DB (*.sqlite)|*.sqlite|");
suffixList += wxT("LibreAtlas DB (*.atlas)|*.atlas|");
+ suffixList += wxT("SQLite DB (*.db)|*.db|");
suffixList += wxT("OGC GeoPackage (*.gpkg)|*.gpkg|");
suffixList += wxT("All files (*.*)|*.*");
wxFileDialog fileDialog(this, wxT("DB connection"),
@@ -2412,7 +2418,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEvent & WXUNUSED(event))
{
if (MemoryDbSave() == true)
{
- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
if (AutoSaveInterval <= 0)
{
@@ -2452,7 +2458,7 @@ void MyFrame::OnMemoryDbSave(wxCommandEvent & WXUNUSED(event))
ExternalSqlitePath = fileDialog.GetPath();
if (MemoryDbSave() == true)
{
- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
wxFileName file(fileDialog.GetPath());
lastDir = file.GetPath();
@@ -2706,7 +2712,7 @@ void MyFrame::OnVacuum(wxCommandEvent & WXUNUSED(event))
} else
{
DbPagesCount(&totalPages2, &freePages2);
- msg = wxT("Current DB was succesfully optimized");
+ msg = wxT("Current DB was successfully optimized");
if (totalPages2 < totalPages)
{
sprintf(dummy, "\n\n%d unused pages were reclaimed",
@@ -3032,7 +3038,7 @@ void MyFrame::OnSqlScript(wxCommandEvent & WXUNUSED(event))
break;
}
sprintf(dummy,
- "SQL Script normal termination\n\n%d SQL statements where performed",
+ "SQL Script normal termination\n\n%d SQL statements were performed",
stmt);
msg = wxString::FromUTF8(dummy);
wxMessageBox(msg, wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
@@ -5070,7 +5076,7 @@ void MyFrame::LastDitchMemoryDbSave()
ExternalSqlitePath = fileDialog.GetPath();
if (MemoryDbSave() == true)
{
- wxMessageBox(wxT("Ok, MEMORY-DB was succesfully saved"),
+ wxMessageBox(wxT("Ok, MEMORY-DB was successfully saved"),
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION,
this);
break;
diff --git a/Makefile.am b/Makefile.am
index 70e4ce2..9e5e204 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,14 +15,14 @@ spatialite_gui_SOURCES = Classdef.h BlobExplorer.cpp \
VectorSymbolizers2.cpp
LDADD = @WX_LIBS@ @LIBSPATIALITE_LIBS@ \
- @LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@
+ @LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lgeos_c
EXTRA_DIST = Makefile-static-MinGW \
Makefile-static-Linux \
Makefile-static-MacOsX \
indent_me
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
SUBDIRS = icons win_resource mac_resource gnome_resource
diff --git a/Makefile.in b/Makefile.in
index 1b6f75f..631e344 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -418,14 +418,14 @@ spatialite_gui_SOURCES = Classdef.h BlobExplorer.cpp \
VectorSymbolizers2.cpp
LDADD = @WX_LIBS@ @LIBSPATIALITE_LIBS@ \
- @LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@
+ @LIBRASTERLITE2_LIBS@ @LIBFREEXL_LIBS@ @LIBXML2_LIBS@ -lgeos_c
EXTRA_DIST = Makefile-static-MinGW \
Makefile-static-Linux \
Makefile-static-MacOsX \
indent_me
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
SUBDIRS = icons win_resource mac_resource gnome_resource
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -438,15 +438,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/MalformedGeoms.cpp b/MalformedGeoms.cpp
index 98c88b0..ab172ae 100644
--- a/MalformedGeoms.cpp
+++ b/MalformedGeoms.cpp
@@ -1012,7 +1012,7 @@ void MalformedGeomsDialog::OnRepair(wxCommandEvent & WXUNUSED(event))
goto clean_up;
}
::wxEndBusyCursor();
- wxMessageBox(wxT("Repair completed succesfully"),
+ wxMessageBox(wxT("Repair completed successfully"),
wxT("spatialite_gui"), wxOK | wxICON_INFORMATION, this);
wxDialog::EndModal(wxID_OK);
return;
diff --git a/Styles.cpp b/Styles.cpp
index fe8dcf6..fee917a 100644
--- a/Styles.cpp
+++ b/Styles.cpp
@@ -5377,22 +5377,19 @@ void *DoExecuteExternalGraphicLoad(void *arg)
params->GetDlg()->GetEventHandler()->AddPendingEvent(evt_start);
clock_start = clock();
wxString abstract;
- if (params->
- GetMainFrame()->ValidateExternalGraphicResource(path.ToUTF8(), &blob,
- &blob_size,
- abstract) == true)
+ if (params->GetMainFrame()->
+ ValidateExternalGraphicResource(path.ToUTF8(), &blob, &blob_size,
+ abstract) == true)
{
wxFileName fn(path);
wxString xlink_href =
wxT("http://www.utopia.gov/") + fn.GetFullName();
wxString filename = fn.GetFullName();
wxString title = fn.GetName();
- if (params->
- GetDlg()->RegisterExternalGraphic(stmt, xlink_href.ToUTF8(),
- title.ToUTF8(),
- abstract.ToUTF8(),
- filename.ToUTF8(), blob,
- blob_size) != true)
+ if (params->GetDlg()->
+ RegisterExternalGraphic(stmt, xlink_href.ToUTF8(), title.ToUTF8(),
+ abstract.ToUTF8(), filename.ToUTF8(),
+ blob, blob_size) != true)
{
params->SetError();
goto error;
diff --git a/TableTree.cpp b/TableTree.cpp
index 472d035..5661258 100644
--- a/TableTree.cpp
+++ b/TableTree.cpp
@@ -3088,7 +3088,7 @@ void MyTableTree::OnCmdRecoverSpatialIndex(wxCommandEvent & WXUNUSED(event))
else if (retval)
wxMessageBox(wxT("Spatial Index idx_") + obj->GetName() +
wxT("_") + obj->GetColumn() +
- wxT(" was succesfully recovered"), wxT("spatialite_gui"),
+ wxT(" was successfully recovered"), wxT("spatialite_gui"),
wxOK | wxICON_INFORMATION, this);
else
wxMessageBox(wxT("ERROR: unable to recover Spatial Index idx_") +
@@ -3971,7 +3971,7 @@ void MyTableTree::OnCmdRepairPolygons(wxCommandEvent & WXUNUSED(event))
if (count > 0)
{
char str[256];
- sprintf(str, "%d Geometries were succesfully updated", count);
+ sprintf(str, "%d Geometries were successfully updated", count);
wxMessageBox(wxString::FromUTF8(str), wxT("spatialite_gui"),
wxOK | wxICON_INFORMATION, this);
::wxEndBusyCursor();
diff --git a/VectorSymbolizers2.cpp b/VectorSymbolizers2.cpp
index b76c60b..1cc2467 100644
--- a/VectorSymbolizers2.cpp
+++ b/VectorSymbolizers2.cpp
@@ -5153,8 +5153,8 @@ void SimpleTextSymbolizerDialog::UpdatePreviewPage()
char facename[1024];
strcpy(facename, FontFamily.ToUTF8());
rl2GraphicsFontPtr font = rl2_search_TrueType_font(MainFrame->GetSqlite(),
- MainFrame->
- GetRL2PrivateData(),
+ MainFrame->GetRL2PrivateData
+ (),
facename,
FontSize);
double aleph = 255.0 * FillOpacity;
diff --git a/config.h.in b/config.h.in
index 0b77022..7671fd8 100644
--- a/config.h.in
+++ b/config.h.in
@@ -72,6 +72,9 @@
/* Define to 1 if you have the `proj' library (-lproj). */
#undef HAVE_LIBPROJ
+/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
+#undef HAVE_LIBSQLITE3
+
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
@@ -97,6 +100,12 @@
/* Define to 1 if you have the <openjpeg-2.1/openjpeg.h> header file. */
#undef HAVE_OPENJPEG_2_1_OPENJPEG_H
+/* Define to 1 if you have the <sqlite3ext.h> header file. */
+#undef HAVE_SQLITE3EXT_H
+
+/* Define to 1 if you have the <sqlite3.h> header file. */
+#undef HAVE_SQLITE3_H
+
/* Define to 1 if you have the `sqrt' function. */
#undef HAVE_SQRT
diff --git a/configure b/configure
index 3857f8c..0c1881c 100755
--- a/configure
+++ b/configure
@@ -15921,6 +15921,34 @@ fi
done
+for ac_header in sqlite3.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3_H 1
+_ACEOF
+
+else
+ as_fn_error $? "cannot find sqlite3.h, bailing out" "$LINENO" 5
+fi
+
+done
+
+for ac_header in sqlite3ext.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sqlite3ext.h" "ac_cv_header_sqlite3ext_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3ext_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3EXT_H 1
+_ACEOF
+
+else
+ as_fn_error $? "cannot find sqlite3ext.h, bailing out" "$LINENO" 5
+fi
+
+done
+
# Checks for typedefs, structures, and compiler characteristics.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
@@ -16478,6 +16506,54 @@ fi
done
+# Checks for installed libraries
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_prepare_v2 in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_prepare_v2+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3 -lm $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_prepare_v2 ();
+int
+main ()
+{
+return sqlite3_prepare_v2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_sqlite3_sqlite3_prepare_v2=yes
+else
+ ac_cv_lib_sqlite3_sqlite3_prepare_v2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSQLITE3 1
+_ACEOF
+
+ LIBS="-lsqlite3 $LIBS"
+
+else
+ as_fn_error $? "'libsqlite3' is required but it doesn't seem to be installed on this system." "$LINENO" 5
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_init_plus in -lproj" >&5
$as_echo_n "checking for pj_init_plus in -lproj... " >&6; }
if ${ac_cv_lib_proj_pj_init_plus+:} false; then :
diff --git a/configure.ac b/configure.ac
index 2d0da56..33663d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT(spatialite_gui, 2.0.0-devel, a.furieri at lqt.it)
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
@@ -98,6 +98,8 @@ AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERROR([cannot find stddef.h, bailing out])])
AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing out])])
AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing out])])
AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing out])])
+AC_CHECK_HEADERS(sqlite3.h,, [AC_MSG_ERROR([cannot find sqlite3.h, bailing out])])
+AC_CHECK_HEADERS(sqlite3ext.h,, [AC_MSG_ERROR([cannot find sqlite3ext.h, bailing out])])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -114,7 +116,9 @@ AC_FUNC_MEMCMP
AC_FUNC_STAT
AC_FUNC_STRFTIME
AC_CHECK_FUNCS([memset sqrt strcasecmp strerror strncasecmp strstr fdatasync ftruncate getcwd gettimeofday localtime_r memmove strerror])
-
+
+# Checks for installed libraries
+AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm)
AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.]),-lm)
#-----------------------------------------------------------------------
diff --git a/gnome_resource/Makefile.in b/gnome_resource/Makefile.in
index 91a7aac..9e8b09e 100644
--- a/gnome_resource/Makefile.in
+++ b/gnome_resource/Makefile.in
@@ -277,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome_resource/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign gnome_resource/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu gnome_resource/Makefile
+ $(AUTOMAKE) --foreign gnome_resource/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/icons/Makefile.in b/icons/Makefile.in
index 338b728..54883ad 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -294,9 +294,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign icons/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu icons/Makefile
+ $(AUTOMAKE) --foreign icons/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/mac_resource/Makefile.in b/mac_resource/Makefile.in
index 873571e..5aeb632 100644
--- a/mac_resource/Makefile.in
+++ b/mac_resource/Makefile.in
@@ -277,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mac_resource/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mac_resource/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu mac_resource/Makefile
+ $(AUTOMAKE) --foreign mac_resource/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/win_resource/Makefile.in b/win_resource/Makefile.in
index 69f03e8..952919b 100644
--- a/win_resource/Makefile.in
+++ b/win_resource/Makefile.in
@@ -277,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win_resource/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win_resource/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu win_resource/Makefile
+ $(AUTOMAKE) --foreign win_resource/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-gui.git
More information about the Pkg-grass-devel
mailing list