← Back to branch summary

~ubuntu-branches/ubuntu/trusty/postgis/trusty-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Alan Boudreault
  • Date: 2010-09-29 09:16:10 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20100929091610-vj4efw8woq34hdn7
Tags: 1.5.2-1
* New upstream release, with a few bug fixes.
* Added shp2pgsql-gui binary.
* Removed patches, applied upstream: getopt.    

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
252
252
        AC_MSG_ERROR([Could not find iconv.h header. Please install libiconv and libiconv-devel.])
253
253
fi
254
254
 
 
255
AC_CHECK_FUNCS([iconvctl libiconvctl],[],[])
 
256
 
255
257
LDFLAGS="$LDFLAGS_SAVE"
256
258
CFLAGS="$CFLAGS_SAVE"
257
259
 
329
331
        fi
330
332
fi      
331
333
 
332
 
dnl Temporary hack until minimum PostgreSQL version is 8.5:
333
 
dnl If PostgreSQL < 8.5 is detected, trigger the inclusion of the new versioned PGXS targets
 
334
dnl Temporary hack until minimum PostgreSQL version is 9.0:
 
335
dnl If PostgreSQL < 9.0 is detected, trigger the inclusion of the new versioned PGXS targets
334
336
PGXSOVERRIDE=0
335
 
if test ! "$PGSQL_MINOR_VERSION" -ge 5; then
 
337
if test ! "$PGSQL_MAJOR_VERSION" -ge 9; then
336
338
        PGXSOVERRIDE=1
337
339
fi
338
340
 
567
569
 
568
570
if test "x$GUI" = "xyes"; then
569
571
        AC_MSG_RESULT([GUI: Build requested, checking for dependencies (GKT+2.0)])
570
 
        case $host in
571
 
                *darwin10.1*)
572
 
                        for frmwrk [ in Cairo GLib Gtk ]; do
573
 
                                if test -d /Library/Frameworks/${frmwrk}.framework; then
574
 
                                        GTK_CFLAGS="$GTK_CFLAGS -I/Library/Frameworks/${frmwrk}.framework/Headers" 
575
 
                                        GTK_LIBS="$GTK_LIBS -framework $frmwrk" 
576
 
                                        AC_MSG_RESULT([GUI: Found /Library/Frameworks/${frmwrk}.framework])
577
 
                                else
578
 
                                        AC_MSG_ERROR([GUI: Mac OS/X build requires the GTK+2.0 frameworks available from http://www.gtk-osx.org])
579
 
                                fi
580
 
                        done
581
 
                        GTK_BUILD="gui"
582
 
                        ;;
583
 
                *)
584
 
                        dnl Try to find the GTK libs with pkgconfig 
585
 
                        AM_PATH_GTK_2_0([2.8.0], [GTK_BUILD="gui"], [GTK_BUILD=""])
586
 
        esac
 
572
        dnl Try to find the GTK libs with pkgconfig 
 
573
        AM_PATH_GTK_2_0([2.8.0], [GTK_BUILD="gui"], [GTK_BUILD=""])
587
574
 
588
575
        dnl Add -mwindows to MinGW GUI build
589
576
        case $host in
602
589
AC_SUBST([GTK_WIN32_FLAGS])
603
590
AC_SUBST([GTK_WIN32_RES])
604
591
AC_SUBST([GTK_BUILD])
 
592
AC_SUBST([IGE_MAC_CFLAGS])
 
593
AC_SUBST([IGE_MAC_LIBS])
605
594
 
606
595
 
607
596
 
669
658
dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
670
659
 
671
660
dnl Output the relevant files
672
 
AC_OUTPUT([liblwgeom/Makefile liblwgeom/cunit/Makefile postgis/Makefile postgis/sqldefines.h loader/Makefile topology/Makefile regress/Makefile doc/Makefile doc/html/image_src/Makefile])
 
661
AC_OUTPUT([liblwgeom/Makefile liblwgeom/cunit/Makefile postgis/Makefile postgis/sqldefines.h loader/Makefile topology/Makefile regress/Makefile doc/Makefile doc/Makefile.comments doc/html/image_src/Makefile])
673
662
 
674
663
dnl ===========================================================================
675
664
dnl Display the configuration status information