API tools faq
paste
Advertisement
goatbar

mb-system autoconf

goatbar
Sep 8th, 2013
114
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 11.59 KB | None | 0 0
raw download clone embed print report
  1. Index: autogen.sh
  2. ===================================================================
  3. --- autogen.sh  (revision 2149)
  4. +++ autogen.sh  (working copy)
  5. @@ -14,7 +14,7 @@
  6.     export LD_LIBRARY_PATH
  7.  fi
  8.  
  9. -(test -f $srcdir/configure.in) || {
  10. +(test -f $srcdir/configure.ac) || {
  11.      echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
  12.      echo " top-level package directory"
  13.      exit 1
  14. @@ -28,7 +28,7 @@
  15.    DIE=1
  16.  }
  17.  
  18. -(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
  19. +(grep "^AC_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
  20.    (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
  21.      echo
  22.      echo "**Error**: You must have \`intltool' installed."
  23. @@ -38,7 +38,7 @@
  24.    }
  25.  }
  26.  
  27. -(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
  28. +(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
  29.    (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
  30.      echo
  31.      echo "**Error**: You must have \`xml-i18n-toolize' installed."
  32. @@ -48,7 +48,7 @@
  33.    }
  34.  }
  35.  
  36. -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
  37. +(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
  38.    (libtool --version) < /dev/null > /dev/null 2>&1 || {
  39.      echo
  40.      echo "**Error**: You must have \`libtool' installed."
  41. @@ -57,8 +57,8 @@
  42.    }
  43.  }
  44.  
  45. -(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
  46. -  (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
  47. +(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
  48. +  (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
  49.    (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
  50.      echo
  51.      echo "**Error**: You must have \`glib' installed."
  52. @@ -94,7 +94,7 @@
  53.    am_opt=--include-deps;;
  54.  esac
  55.  
  56. -for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print`
  57. +for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print`
  58.  do
  59.    dr=`dirname $coin`
  60.    if test -f $dr/NO-AUTO-GEN; then
  61. @@ -105,7 +105,7 @@
  62.  
  63.        aclocalinclude="$ACLOCAL_FLAGS"
  64.  
  65. -      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
  66. +      if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
  67.     echo "Creating $dr/aclocal.m4 ..."
  68.     test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
  69.     echo "Running glib-gettextize...  Ignore non-fatal messages."
  70. @@ -113,15 +113,15 @@
  71.     echo "Making $dr/aclocal.m4 writable ..."
  72.     test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
  73.        fi
  74. -      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
  75. +      if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null; then
  76.          echo "Running intltoolize..."
  77.     intltoolize --copy --force --automake
  78.        fi
  79. -      if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
  80. +      if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
  81.          echo "Running xml-i18n-toolize..."
  82.     xml-i18n-toolize --copy --force --automake
  83.        fi
  84. -      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
  85. +      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
  86.     if test -z "$NO_LIBTOOLIZE" ; then
  87.       echo "Running libtoolize..."
  88.       libtoolize --force --copy
  89. @@ -129,7 +129,7 @@
  90.        fi
  91.        echo "Running aclocal $aclocalinclude ..."
  92.        aclocal $aclocalinclude
  93. -      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
  94. +      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
  95.     echo "Running autoheader..."
  96.     autoheader
  97.        fi
  98. Index: src/mbeditviz/Makefile.am
  99. ===================================================================
  100. --- src/mbeditviz/Makefile.am   (revision 2149)
  101. +++ src/mbeditviz/Makefile.am   (working copy)
  102. @@ -24,9 +24,10 @@
  103.  endif
  104.  
  105.  mbeditviz_SOURCES = mbeditviz_main.c mbeditviz_callbacks.c mbeditviz_prog.c mbeditviz_creation.c
  106. -mbeditviz_LDADD = ${libnetcdf_LIBS} ${libgmt_LIBS} @MOTIF_LIB_DIR@ \
  107. +mbeditviz_LDADD = \
  108.     $(top_builddir)/src/mbio/libmbio.la $(top_builddir)/src/mbaux/libmbaux.la \
  109.     $(top_builddir)/src/mbaux/libmbxgr.la $(top_builddir)/src/mbaux/libmbps.la \
  110.     $(top_builddir)/src/mbview/libmbview.la \
  111. +   @MOTIF_LIB_DIR@
  112.     @MOTIF_LIB@ @GL_LIB@ \
  113. -   ${libnetcdf_LIBS} ${libgmt_LIBS} $(LIBM)
  114. +   ${libgmt_LIBS} ${libnetcdf_LIBS} $(LIBM)
  115. Index: src/mbedit/Makefile.am
  116. ===================================================================
  117. --- src/mbedit/Makefile.am  (revision 2149)
  118. +++ src/mbedit/Makefile.am  (working copy)
  119. @@ -12,9 +12,10 @@
  120.    AM_LDFLAGS += -L$(top_builddir)/src/gsf
  121.  endif
  122.  
  123. -LIBS = ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  124. +LIBS = \
  125.         $(top_builddir)/src/mbio/libmbio.la $(top_builddir)/src/mbaux/libmbaux.la \
  126.         $(top_builddir)/src/mbaux/libmbxgr.la \
  127. +       ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  128.         -lXm -lXt -lX11 $(LIBM)
  129.  
  130.  mbedit_SOURCES = mbedit.c mbedit_bxutils.c mbedit_callbacks.c mbedit_creation.c mbedit_prog.c mbedit_creation.h mbedit.h
  131. Index: src/mbnavedit/Makefile.am
  132. ===================================================================
  133. --- src/mbnavedit/Makefile.am   (revision 2149)
  134. +++ src/mbnavedit/Makefile.am   (working copy)
  135. @@ -12,9 +12,10 @@
  136.    AM_LDFLAGS += -L$(top_builddir)/src/gsf
  137.  endif
  138.  
  139. -LIBS = ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  140. +LIBS = \
  141.         $(top_builddir)/src/mbio/libmbio.la $(top_builddir)/src/mbaux/libmbaux.la \
  142.         $(top_builddir)/src/mbaux/libmbxgr.la \
  143. +       ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  144.         -lXm -lXt -lX11 $(LIBM)
  145.  
  146.  mbnavedit_SOURCES = mbnavedit.c mbnavedit_creation.c mbnavedit_util.c mbnavedit_callbacks.c \
  147. Index: src/mbvelocitytool/Makefile.am
  148. ===================================================================
  149. --- src/mbvelocitytool/Makefile.am  (revision 2149)
  150. +++ src/mbvelocitytool/Makefile.am  (working copy)
  151. @@ -12,9 +12,10 @@
  152.    AM_LDFLAGS += -L$(top_builddir)/src/gsf
  153.  endif
  154.  
  155. -LIBS = ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  156. +LIBS = \
  157.         $(top_builddir)/src/mbio/libmbio.la $(top_builddir)/src/mbaux/libmbaux.la \
  158.         $(top_builddir)/src/mbaux/libmbxgr.la \
  159. +       ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  160.         -lXm -lXt -lX11 $(LIBM)
  161.  
  162.  mbvelocitytool_SOURCES = mbvelocity_bxutils.c mbvelocity.c mbvelocity_callbacks.c \
  163. Index: src/utilities/Makefile.am
  164. ===================================================================
  165. --- src/utilities/Makefile.am   (revision 2149)
  166. +++ src/utilities/Makefile.am   (working copy)
  167. @@ -63,7 +63,7 @@
  168.    AM_LDFLAGS += -L$(top_builddir)/src/gsf
  169.  endif
  170.  
  171. -LIBS = ${libnetcdf_LIBS} ${libgmt_LIBS} $(top_builddir)/src/mbio/libmbio.la $(LIBM)
  172. +LIBS =  $(top_builddir)/src/mbio/libmbio.la ${libgmt_LIBS} ${libnetcdf_LIBS} $(LIBM)
  173.  
  174.  mbhsdump_SOURCES = mbhsdump.c
  175.  
  176. Index: src/mbaux/Makefile.am
  177. ===================================================================
  178. --- src/mbaux/Makefile.am   (revision 2149)
  179. +++ src/mbaux/Makefile.am   (working copy)
  180. @@ -13,7 +13,7 @@
  181.  
  182.  libmbps_la_LDFLAGS = -no-undefined -version-info 0:0:0 ${libgmt_CFLAGS}
  183.  libmbps_la_SOURCES = mb_pslibface.c
  184. -libmbps_la_LIBADD = ${libnetcdf_LIBS} ${libgmt_LIBS}
  185. +libmbps_la_LIBADD = ${libgmt_LIBS} ${libnetcdf_LIBS}
  186.  
  187.  libmbaux_la_LDFLAGS = -no-undefined -version-info 0:0:0 ${libgmt_CFLAGS} -L$(top_builddir)/src/mbio
  188.  libmbaux_la_SOURCES = \
  189. @@ -21,7 +21,7 @@
  190.               mb_delaun.c mb_track.c mb_truecont.c mb_readgrd.c \
  191.               mb_intersectgrid.c
  192.  libmbaux_la_CFLAGS = ${libnetcdf_CFLAGS} ${libgmt_CFLAGS}
  193. -libmbaux_la_LIBADD = ${libnetcdf_LIBS} ${libgmt_LIBS} -lmbio libmbps.la
  194. +libmbaux_la_LIBADD =  -lmbio libmbps.la ${libgmt_LIBS} ${libnetcdf_LIBS}
  195.  
  196.  if BUILD_MOTIF
  197.   libmbxgr_la_LDFLAGS = -no-undefined -version-info 0:0:0 ${libgmt_CFLAGS}
  198. Index: src/mbnavadjust/Makefile.am
  199. ===================================================================
  200. --- src/mbnavadjust/Makefile.am (revision 2149)
  201. +++ src/mbnavadjust/Makefile.am (working copy)
  202. @@ -12,9 +12,10 @@
  203.    AM_LDFLAGS += -L$(top_builddir)/src/gsf
  204.  endif
  205.  
  206. -LIBS = ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  207. +LIBS = \
  208.         $(top_builddir)/src/mbio/libmbio.la $(top_builddir)/src/mbaux/libmbaux.la \
  209.         $(top_builddir)/src/mbaux/libmbxgr.la \
  210. +       ${libnetcdf_LIBS} @MOTIF_LIB_DIR@ \
  211.         -lXm -lXt -lX11 $(LIBM)
  212.  
  213.  mbnavadjust_SOURCES = mbnavadjust.c mbnavadjust_callbacks.c mbnavadjust_creation.c \
  214. Index: src/mbgrdviz/Makefile.am
  215. ===================================================================
  216. --- src/mbgrdviz/Makefile.am    (revision 2149)
  217. +++ src/mbgrdviz/Makefile.am    (working copy)
  218. @@ -24,10 +24,10 @@
  219.  endif
  220.  
  221.  mbgrdviz_SOURCES =  mbgrdviz_main.c mbgrdviz_callbacks.c  mbgrdviz_creation.c
  222. -mbgrdviz_LDADD = ${libnetcdf_LIBS} ${libgmt_LIBS} @MOTIF_LIB_DIR@ \
  223. +mbgrdviz_LDADD =  \
  224.         $(top_builddir)/src/mbio/libmbio.la $(top_builddir)/src/mbaux/libmbaux.la \
  225.         $(top_builddir)/src/mbaux/libmbxgr.la $(top_builddir)/src/mbaux/libmbps.la \
  226. -        $(top_builddir)/src/mbview/libmbview.la \
  227. -       @MOTIF_LIB@ @GL_LIB@ \
  228. -       ${libnetcdf_LIBS} ${libgmt_LIBS} $(LIBM)
  229. +       $(top_builddir)/src/mbview/libmbview.la \
  230. +       @MOTIF_LIB_DIR@ @MOTIF_LIB@ @GL_LIB@ \
  231. +       ${libgmt_LIBS} ${libnetcdf_LIBS} $(LIBM)
  232.  
  233. Index: src/otps/Makefile.am
  234. ===================================================================
  235. --- src/otps/Makefile.am    (revision 2149)
  236. +++ src/otps/Makefile.am    (working copy)
  237. @@ -12,7 +12,7 @@
  238.    AM_LDFLAGS += -L$(top_builddir)/src/gsf
  239.  endif
  240.  
  241. -LIBS = ${libnetcdf_LIBS} $(top_builddir)/src/mbio/libmbio.la $(LIBM)
  242. +LIBS = $(top_builddir)/src/mbio/libmbio.la ${libnetcdf_LIBS} $(LIBM)
  243.  
  244.  mbotps_SOURCES = mbotps.c
  245.  
  246. Index: src/mbio/Makefile.am
  247. ===================================================================
  248. --- src/mbio/Makefile.am    (revision 2149)
  249. +++ src/mbio/Makefile.am    (working copy)
  250. @@ -129,9 +129,10 @@
  251.    libmbio_la_SOURCES += mbsys_gsf.c mbr_gsfgenmb.c
  252.  endif
  253.  
  254. -libmbio_la_LIBADD = ${libnetcdf_LIBS} ${libgmt_LIBS} @XDR_LIB@ \
  255. +libmbio_la_LIBADD = \
  256.            $(top_builddir)/src/mr1pr/libmbmr1pr.la \
  257. -                   $(top_builddir)/src/surf/libmbsapi.la $(top_builddir)/src/proj/libmbproj.la
  258. +                   $(top_builddir)/src/surf/libmbsapi.la $(top_builddir)/src/proj/libmbproj.la \
  259. +                   ${libgmt_LIBS} ${libnetcdf_LIBS} @XDR_LIB@
  260.  if BUILD_GSF
  261.    libmbio_la_LIBADD += $(top_builddir)/src/gsf/libmbgsf.la
  262.  endif
  263. Index: src/gmt/Makefile.am
  264. ===================================================================
  265. --- src/gmt/Makefile.am (revision 2149)
  266. +++ src/gmt/Makefile.am (working copy)
  267. @@ -9,7 +9,7 @@
  268.    AM_LDFLAGS +=  -L$(top_builddir)/src/gsf
  269.  endif
  270.  
  271. -LIBS = ${libnetcdf_LIBS} ${libgmt_LIBS} $(top_builddir)/src/mbio/libmbio.la $(LIBM)
  272. +LIBS = $(top_builddir)/src/mbio/libmbio.la  ${libgmt_LIBS} ${libnetcdf_LIBS} $(LIBM)
  273.  
  274.  mbcontour_SOURCES = mbcontour.c
  275.  mbcontour_LDADD = $(top_builddir)/src/mbaux/libmbaux.la $(top_builddir)/src/mbaux/libmbps.la
  276. Index: src/mbview/Makefile.am
  277. ===================================================================
  278. --- src/mbview/Makefile.am  (revision 2149)
  279. +++ src/mbview/Makefile.am  (working copy)
  280. @@ -23,11 +23,11 @@
  281.         mbview_secondary.c mbview_pick.c mbview_profile.c mbview_site.c \
  282.         mbview_route.c mbview_nav.c mbview_vector.c mbview_bxutils.c mb_glwdrawa.c Mb3dsdg.c \
  283.         mb3dsoundings_callbacks.c MBpedit.c mbpingedit_callbacks.c
  284. -libmbview_la_LIBADD = ${libnetcdf_LIBS} ${libgmt_LIBS} @XDR_LIB@ \
  285. +libmbview_la_LIBADD = \
  286.         $(top_builddir)/src/mr1pr/libmbmr1pr.la \
  287.         $(top_builddir)/src/surf/libmbsapi.la \
  288.         $(top_builddir)/src/proj/libmbproj.la \
  289.         $(top_builddir)/src/mbio/libmbio.la \
  290.         $(top_builddir)/src/mbaux/libmbaux.la \
  291. -       @MOTIF_LIB@ @GL_LIB@ \
  292. -       ${libnetcdf_LIBS} ${libgmt_LIBS}
  293. +       @XDR_LIB@ @MOTIF_LIB@ @GL_LIB@ \
  294. +       ${libgmt_LIBS} ${libnetcdf_LIBS}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!