fix build on mac, fix wrong AX_PKG_CHECK
This commit is contained in:
		
							
								
								
									
										10
									
								
								ChangeLog
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								ChangeLog
									
									
									
									
									
								
							@@ -1,3 +1,13 @@
 | 
				
			|||||||
 | 
					2015-05-12 13:32  marc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* ax_check_qt.m4, ax_init_standard_project.m4, configure.ac:
 | 
				
			||||||
 | 
						  QtNetwork depends on QT >= 5.2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					2015-05-12 08:57  marc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
 | 
				
			||||||
 | 
						  src/makefile.am: fixed build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2015-05-11 13:45  marc
 | 
					2015-05-11 13:45  marc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* src/makefile.am: don't miss build of cert2text
 | 
						* src/makefile.am: don't miss build of cert2text
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,7 +68,7 @@ dnl refers to ${prefix}.  Thus we have to use `eval' twice.
 | 
				
			|||||||
#     $3 = filename of makefile.in
 | 
					#     $3 = filename of makefile.in
 | 
				
			||||||
AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
 | 
					AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
 | 
				
			||||||
  sh_add_makefile_target_dep() {
 | 
					  sh_add_makefile_target_dep() {
 | 
				
			||||||
    sed -i ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
 | 
					    sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
 | 
				
			||||||
    if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then
 | 
					    if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then
 | 
				
			||||||
        echo "${1}: ${2}" >> "${srcdir}/${3}"
 | 
					        echo "${1}: ${2}" >> "${srcdir}/${3}"
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
@@ -442,8 +442,6 @@ AC_DEFUN([AX_PKG_REQUIRE], [
 | 
				
			|||||||
      if test ${$1_found} -eq 0; then
 | 
					      if test ${$1_found} -eq 0; then
 | 
				
			||||||
        AC_MSG_ERROR([Required package $2 or $4 for feature $1 not installed])
 | 
					        AC_MSG_ERROR([Required package $2 or $4 for feature $1 not installed])
 | 
				
			||||||
      fi
 | 
					      fi
 | 
				
			||||||
    else
 | 
					 | 
				
			||||||
      AC_MSG_ERROR([Required package $2 for feature $1 not installed])
 | 
					 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
  ])
 | 
					  ])
 | 
				
			||||||
  AC_SUBST(AM_CPPFLAGS)
 | 
					  AC_SUBST(AM_CPPFLAGS)
 | 
				
			||||||
@@ -457,6 +455,8 @@ AC_DEFUN([AX_PKG_REQUIRE], [
 | 
				
			|||||||
      AC_MSG_ERROR([Required header $3 for feature $1 not found])
 | 
					      AC_MSG_ERROR([Required header $3 for feature $1 not found])
 | 
				
			||||||
    ])
 | 
					    ])
 | 
				
			||||||
    CPPFLAGS=${old_CPPFLAGS}
 | 
					    CPPFLAGS=${old_CPPFLAGS}
 | 
				
			||||||
 | 
					  elif test ${$1_found} -eq 0; then
 | 
				
			||||||
 | 
					    AC_MSG_ERROR([Required package $2 for feature $1 not installed])
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
])
 | 
					])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user